@hebcal/core 5.10.0 → 6.0.0

package/dist/candles.d.ts

@@ -33,7 +33,7 @@ export declare class TimedChanukahEvent extends ChanukahEvent {
     eventTime: Date;
     eventTimeStr: string;
     readonly location: Location;
-    constructor(date: HDate, desc: string, mask: number, eventTime: Date, location: Location);
+    constructor(ev: ChanukahEvent, eventTime: Date, location: Location);
 }
 /**
  * Makes a candle-lighting event for Chankah (not on Friday/Saturday).
@@ -41,4 +41,4 @@ export declare class TimedChanukahEvent extends ChanukahEvent {
  * Another source suggests 4.6667 degrees below horizon.
  * @private
  */
-export declare function makeWeekdayChanukahCandleLighting(ev: HolidayEvent, hd: HDate, options: CalOptions): TimedChanukahEvent | null;
+export declare function makeWeekdayChanukahCandleLighting(ev: ChanukahEvent, options: CalOptions): TimedChanukahEvent | null;

package/dist/esm/DailyLearning.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.10.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/core v6.0.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 const cals = new Map();
 /**
  * Plug-ins for daily learning calendars such as Daf Yomi, Mishna Yomi, Nach Yomi, etc.

package/dist/esm/DailyLearning.js.map

@@ -1 +1 @@
-{"version":3,"file":"DailyLearning.js","sources":["../../../src/DailyLearning.ts"],"sourcesContent":["import {HDate} from '@hebcal/hdate';\nimport {Event} from './event';\n\ntype LearningCalendar = {\n  fn: Function;\n  startDate?: HDate;\n};\nconst cals = new Map<string, LearningCalendar>();\n\n/**\n * Plug-ins for daily learning calendars such as Daf Yomi, Mishna Yomi, Nach Yomi, etc.\n *\n * Learning schedules are provided by the `@hebcal/learning` package.\n */\nexport class DailyLearning {\n  /**\n   * Register a new learning calendar.\n   * @param name case insensitive\n   * @param calendar a function that returns an `Event` or `null`\n   * @param startDate the first date for which this calendar is valid\n   */\n  static addCalendar(name: string, calendar: Function, startDate?: HDate) {\n    if (typeof calendar !== 'function') {\n      throw new TypeError(`Invalid calendar function: ${calendar}`);\n    }\n    cals.set(name.toLowerCase(), {\n      fn: calendar,\n      startDate: startDate,\n    });\n  }\n\n  /**\n   * Returns an event from daily calendar for a given date. Returns `null` if there\n   * is no learning from this calendar on this date.\n   * @param name case insensitive\n   * @param hd Hebrew Date\n   * @param il true for Israel, false for Diaspora\n   */\n  static lookup(name: string, hd: HDate, il: boolean): Event | null {\n    const cal = cals.get(name.toLowerCase());\n    if (typeof cal === 'object') {\n      return cal.fn(hd, il);\n    }\n    return null;\n  }\n\n  static getStartDate(name: string): HDate | undefined {\n    const cal = cals.get(name.toLowerCase());\n    if (typeof cal === 'object') {\n      return cal.startDate;\n    }\n    return undefined;\n  }\n\n  /**\n   * Tests to see if learning calendar has been registered\n   * @param name case insensitive\n   */\n  static has(name: string): boolean {\n    return cals.has(name.toLowerCase());\n  }\n\n  /** Returns the names of all calendars registered */\n  static getCalendars(): string[] {\n    return Array.from(cals.keys());\n  }\n}\n"],"names":[],"mappings":";AAOA,MAAM,IAAI,GAAG,IAAI,GAAG,EAA4B;AAEhD;;;;AAIG;MACU,aAAa,CAAA;AACxB;;;;;AAKG;AACH,IAAA,OAAO,WAAW,CAAC,IAAY,EAAE,QAAkB,EAAE,SAAiB,EAAA;AACpE,QAAA,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;AAClC,YAAA,MAAM,IAAI,SAAS,CAAC,8BAA8B,QAAQ,CAAA,CAAE,CAAC;;AAE/D,QAAA,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;AAC3B,YAAA,EAAE,EAAE,QAAQ;AACZ,YAAA,SAAS,EAAE,SAAS;AACrB,SAAA,CAAC;;AAGJ;;;;;;AAMG;AACH,IAAA,OAAO,MAAM,CAAC,IAAY,EAAE,EAAS,EAAE,EAAW,EAAA;QAChD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AACxC,QAAA,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,OAAO,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;;AAEvB,QAAA,OAAO,IAAI;;IAGb,OAAO,YAAY,CAAC,IAAY,EAAA;QAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AACxC,QAAA,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,OAAO,GAAG,CAAC,SAAS;;AAEtB,QAAA,OAAO,SAAS;;AAGlB;;;AAGG;IACH,OAAO,GAAG,CAAC,IAAY,EAAA;QACrB,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;;;AAIrC,IAAA,OAAO,YAAY,GAAA;QACjB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;;AAEjC;;;;"}
+{"version":3,"file":"DailyLearning.js","sources":["../../../src/DailyLearning.ts"],"sourcesContent":["import {HDate} from '@hebcal/hdate';\nimport {Event} from './event';\n\ntype LearningCalendar = {\n  fn: Function;\n  startDate?: HDate;\n};\nconst cals = new Map<string, LearningCalendar>();\n\n/**\n * Plug-ins for daily learning calendars such as Daf Yomi, Mishna Yomi, Nach Yomi, etc.\n *\n * Learning schedules are provided by the `@hebcal/learning` package.\n */\nexport class DailyLearning {\n  /**\n   * Register a new learning calendar.\n   * @param name case insensitive\n   * @param calendar a function that returns an `Event` or `null`\n   * @param startDate the first date for which this calendar is valid\n   */\n  static addCalendar(name: string, calendar: Function, startDate?: HDate) {\n    if (typeof calendar !== 'function') {\n      throw new TypeError(`Invalid calendar function: ${calendar}`);\n    }\n    cals.set(name.toLowerCase(), {\n      fn: calendar,\n      startDate: startDate,\n    });\n  }\n\n  /**\n   * Returns an event from daily calendar for a given date. Returns `null` if there\n   * is no learning from this calendar on this date.\n   * @param name case insensitive\n   * @param hd Hebrew Date\n   * @param il true for Israel, false for Diaspora\n   */\n  static lookup(name: string, hd: HDate, il: boolean): Event | null {\n    const cal = cals.get(name.toLowerCase());\n    if (typeof cal === 'object') {\n      return cal.fn(hd, il);\n    }\n    return null;\n  }\n\n  static getStartDate(name: string): HDate | undefined {\n    const cal = cals.get(name.toLowerCase());\n    if (typeof cal === 'object') {\n      return cal.startDate;\n    }\n    return undefined;\n  }\n\n  /**\n   * Tests to see if learning calendar has been registered\n   * @param name case insensitive\n   */\n  static has(name: string): boolean {\n    return cals.has(name.toLowerCase());\n  }\n\n  /** Returns the names of all calendars registered */\n  static getCalendars(): string[] {\n    return Array.from(cals.keys());\n  }\n}\n"],"names":[],"mappings":";AAOA,MAAM,IAAI,GAAG,IAAI,GAAG,EAA4B;AAEhD;;;;AAIG;MACU,aAAa,CAAA;AACxB;;;;;AAKG;AACH,IAAA,OAAO,WAAW,CAAC,IAAY,EAAE,QAAkB,EAAE,SAAiB,EAAA;AACpE,QAAA,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;AAClC,YAAA,MAAM,IAAI,SAAS,CAAC,8BAA8B,QAAQ,CAAA,CAAE,CAAC;QAC/D;AACA,QAAA,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;AAC3B,YAAA,EAAE,EAAE,QAAQ;AACZ,YAAA,SAAS,EAAE,SAAS;AACrB,SAAA,CAAC;IACJ;AAEA;;;;;;AAMG;AACH,IAAA,OAAO,MAAM,CAAC,IAAY,EAAE,EAAS,EAAE,EAAW,EAAA;QAChD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AACxC,QAAA,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,OAAO,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QACvB;AACA,QAAA,OAAO,IAAI;IACb;IAEA,OAAO,YAAY,CAAC,IAAY,EAAA;QAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AACxC,QAAA,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,OAAO,GAAG,CAAC,SAAS;QACtB;AACA,QAAA,OAAO,SAAS;IAClB;AAEA;;;AAGG;IACH,OAAO,GAAG,CAAC,IAAY,EAAA;QACrB,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IACrC;;AAGA,IAAA,OAAO,YAAY,GAAA;QACjB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAChC;AACD;;;;"}

package/dist/esm/HebrewDateEvent.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.10.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/core v6.0.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 import { Locale, gematriya, months } from '@hebcal/hdate';
 import { Event, flags } from './event.js';
 import './locale.js';
@@ -23,7 +23,7 @@ class HebrewDateEvent extends Event {
      */
     render(locale) {
         const locale1 = locale === null || locale === void 0 ? void 0 : locale.toLowerCase();
-        const locale0 = locale1 !== null && locale1 !== void 0 ? locale1 : Locale.getLocaleName();
+        const locale0 = locale1 !== null && locale1 !== void 0 ? locale1 : 'en';
         const hd = this.getDate();
         switch (locale0) {
             case 'h':
@@ -57,7 +57,7 @@ class HebrewDateEvent extends Event {
      */
     renderBrief(locale) {
         const locale1 = locale === null || locale === void 0 ? void 0 : locale.toLowerCase();
-        const locale0 = locale1 !== null && locale1 !== void 0 ? locale1 : Locale.getLocaleName();
+        const locale0 = locale1 !== null && locale1 !== void 0 ? locale1 : 'en';
         const hd = this.getDate();
         if (hd.getMonth() === months.TISHREI && hd.getDate() === 1) {
             return this.render(locale0);

package/dist/esm/HebrewDateEvent.js.map

@@ -1 +1 @@
-{"version":3,"file":"HebrewDateEvent.js","sources":["../../../src/HebrewDateEvent.ts"],"sourcesContent":["import {HDate, gematriya, months, Locale} from '@hebcal/hdate';\nimport {Event, flags} from './event';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\n/** Daily Hebrew date (\"11th of Sivan, 5780\") */\nexport class HebrewDateEvent extends Event {\n  /**\n   * @param date\n   */\n  constructor(date: HDate) {\n    super(date, date.toString(), flags.HEBREW_DATE);\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   * @example\n   * import {HDate, HebrewDateEvent, months} from '@hebcal/core';\n   *\n   * const hd = new HDate(15, months.CHESHVAN, 5769);\n   * const ev = new HebrewDateEvent(hd);\n   * console.log(ev.render('en')); // '15th of Cheshvan, 5769'\n   * console.log(ev.render('he')); // 'ט״ו חֶשְׁוָן תשס״ט'\n   */\n  render(locale?: string): string {\n    const locale1 = locale?.toLowerCase();\n    const locale0 = locale1 ?? Locale.getLocaleName();\n    const hd = this.getDate();\n    switch (locale0) {\n      case 'h':\n      case 'he':\n        return hd.renderGematriya(false);\n      case 'he-x-nonikud':\n        return hd.renderGematriya(true);\n      default:\n        return hd.render(locale0, true);\n    }\n  }\n  /**\n   * @private\n   * @param locale\n   */\n  private renderBriefHebrew(locale: string): string {\n    const hd = this.getDate();\n    const dd = hd.getDate();\n    const mm = Locale.gettext(hd.getMonthName(), locale);\n    return gematriya(dd) + ' ' + mm;\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   * @example\n   * import {HDate, HebrewDateEvent, months} from '@hebcal/core';\n   *\n   * const hd = new HDate(15, months.CHESHVAN, 5769);\n   * const ev = new HebrewDateEvent(hd);\n   * console.log(ev.renderBrief()); // '15th of Cheshvan'\n   * console.log(ev.renderBrief('he')); // 'ט״ו חֶשְׁוָן'\n   */\n  renderBrief(locale?: string): string {\n    const locale1 = locale?.toLowerCase();\n    const locale0 = locale1 ?? Locale.getLocaleName();\n    const hd = this.getDate();\n    if (hd.getMonth() === months.TISHREI && hd.getDate() === 1) {\n      return this.render(locale0);\n    }\n    switch (locale0) {\n      case 'h':\n      case 'he':\n      case 'he-x-nonikud':\n        return this.renderBriefHebrew(locale0);\n      default:\n        return hd.render(locale0, false);\n    }\n  }\n}\n"],"names":[],"mappings":";;;;;AAIA;AACM,MAAO,eAAgB,SAAQ,KAAK,CAAA;AACxC;;AAEG;AACH,IAAA,WAAA,CAAY,IAAW,EAAA;AACrB,QAAA,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,WAAW,CAAC;;AAEjD;;;;;;;;;AASG;AACH,IAAA,MAAM,CAAC,MAAe,EAAA;QACpB,MAAM,OAAO,GAAG,MAAM,KAAA,IAAA,IAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,EAAE;AACrC,QAAA,MAAM,OAAO,GAAG,OAAO,KAAA,IAAA,IAAP,OAAO,KAAA,MAAA,GAAP,OAAO,GAAI,MAAM,CAAC,aAAa,EAAE;AACjD,QAAA,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE;QACzB,QAAQ,OAAO;AACb,YAAA,KAAK,GAAG;AACR,YAAA,KAAK,IAAI;AACP,gBAAA,OAAO,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;AAClC,YAAA,KAAK,cAAc;AACjB,gBAAA,OAAO,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;AACjC,YAAA;gBACE,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC;;;AAGrC;;;AAGG;AACK,IAAA,iBAAiB,CAAC,MAAc,EAAA;AACtC,QAAA,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE;AACzB,QAAA,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE;AACvB,QAAA,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,MAAM,CAAC;QACpD,OAAO,SAAS,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,EAAE;;AAEjC;;;;;;;;;AASG;AACH,IAAA,WAAW,CAAC,MAAe,EAAA;QACzB,MAAM,OAAO,GAAG,MAAM,KAAA,IAAA,IAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,EAAE;AACrC,QAAA,MAAM,OAAO,GAAG,OAAO,KAAA,IAAA,IAAP,OAAO,KAAA,MAAA,GAAP,OAAO,GAAI,MAAM,CAAC,aAAa,EAAE;AACjD,QAAA,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE;AACzB,QAAA,IAAI,EAAE,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;AAC1D,YAAA,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;;QAE7B,QAAQ,OAAO;AACb,YAAA,KAAK,GAAG;AACR,YAAA,KAAK,IAAI;AACT,YAAA,KAAK,cAAc;AACjB,gBAAA,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;AACxC,YAAA;gBACE,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC;;;AAGvC;;;;"}
+{"version":3,"file":"HebrewDateEvent.js","sources":["../../../src/HebrewDateEvent.ts"],"sourcesContent":["import {HDate, gematriya, months, Locale} from '@hebcal/hdate';\nimport {Event, flags} from './event';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\n/** Daily Hebrew date (\"11th of Sivan, 5780\") */\nexport class HebrewDateEvent extends Event {\n  /**\n   * @param date\n   */\n  constructor(date: HDate) {\n    super(date, date.toString(), flags.HEBREW_DATE);\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   * @example\n   * import {HDate, HebrewDateEvent, months} from '@hebcal/core';\n   *\n   * const hd = new HDate(15, months.CHESHVAN, 5769);\n   * const ev = new HebrewDateEvent(hd);\n   * console.log(ev.render('en')); // '15th of Cheshvan, 5769'\n   * console.log(ev.render('he')); // 'ט״ו חֶשְׁוָן תשס״ט'\n   */\n  render(locale?: string): string {\n    const locale1 = locale?.toLowerCase();\n    const locale0 = locale1 ?? 'en';\n    const hd = this.getDate();\n    switch (locale0) {\n      case 'h':\n      case 'he':\n        return hd.renderGematriya(false);\n      case 'he-x-nonikud':\n        return hd.renderGematriya(true);\n      default:\n        return hd.render(locale0, true);\n    }\n  }\n  /**\n   * @private\n   * @param locale\n   */\n  private renderBriefHebrew(locale: string): string {\n    const hd = this.getDate();\n    const dd = hd.getDate();\n    const mm = Locale.gettext(hd.getMonthName(), locale);\n    return gematriya(dd) + ' ' + mm;\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   * @example\n   * import {HDate, HebrewDateEvent, months} from '@hebcal/core';\n   *\n   * const hd = new HDate(15, months.CHESHVAN, 5769);\n   * const ev = new HebrewDateEvent(hd);\n   * console.log(ev.renderBrief()); // '15th of Cheshvan'\n   * console.log(ev.renderBrief('he')); // 'ט״ו חֶשְׁוָן'\n   */\n  renderBrief(locale?: string): string {\n    const locale1 = locale?.toLowerCase();\n    const locale0 = locale1 ?? 'en';\n    const hd = this.getDate();\n    if (hd.getMonth() === months.TISHREI && hd.getDate() === 1) {\n      return this.render(locale0);\n    }\n    switch (locale0) {\n      case 'h':\n      case 'he':\n      case 'he-x-nonikud':\n        return this.renderBriefHebrew(locale0);\n      default:\n        return hd.render(locale0, false);\n    }\n  }\n}\n"],"names":[],"mappings":";;;;;AAIA;AACM,MAAO,eAAgB,SAAQ,KAAK,CAAA;AACxC;;AAEG;AACH,IAAA,WAAA,CAAY,IAAW,EAAA;AACrB,QAAA,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,WAAW,CAAC;IACjD;AACA;;;;;;;;;AASG;AACH,IAAA,MAAM,CAAC,MAAe,EAAA;QACpB,MAAM,OAAO,GAAG,MAAM,KAAA,IAAA,IAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,EAAE;QACrC,MAAM,OAAO,GAAG,OAAO,KAAA,IAAA,IAAP,OAAO,KAAA,MAAA,GAAP,OAAO,GAAI,IAAI;AAC/B,QAAA,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE;QACzB,QAAQ,OAAO;AACb,YAAA,KAAK,GAAG;AACR,YAAA,KAAK,IAAI;AACP,gBAAA,OAAO,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;AAClC,YAAA,KAAK,cAAc;AACjB,gBAAA,OAAO,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;AACjC,YAAA;gBACE,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC;;IAErC;AACA;;;AAGG;AACK,IAAA,iBAAiB,CAAC,MAAc,EAAA;AACtC,QAAA,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE;AACzB,QAAA,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE;AACvB,QAAA,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,MAAM,CAAC;QACpD,OAAO,SAAS,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,EAAE;IACjC;AACA;;;;;;;;;AASG;AACH,IAAA,WAAW,CAAC,MAAe,EAAA;QACzB,MAAM,OAAO,GAAG,MAAM,KAAA,IAAA,IAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,EAAE;QACrC,MAAM,OAAO,GAAG,OAAO,KAAA,IAAA,IAAP,OAAO,KAAA,MAAA,GAAP,OAAO,GAAI,IAAI;AAC/B,QAAA,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE;AACzB,QAAA,IAAI,EAAE,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;AAC1D,YAAA,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;QAC7B;QACA,QAAQ,OAAO;AACb,YAAA,KAAK,GAAG;AACR,YAAA,KAAK,IAAI;AACT,YAAA,KAAK,cAAc;AACjB,gBAAA,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;AACxC,YAAA;gBACE,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC;;IAEtC;AACD;;;;"}

package/dist/esm/HolidayEvent.d.ts

@@ -5,7 +5,6 @@ import './locale';
 export declare class HolidayEvent extends Event {
     /** During Sukkot or Pesach */
     cholHaMoedDay?: number;
-    chanukahDay?: number;
     /**
      * `true` if the fast day was postponed a day to avoid Shabbat.
      * - Tish'a B'Av postponed from the 9th to the 10th
@@ -29,11 +28,6 @@ export declare class HolidayEvent extends Event {
      * @param [locale] Optional locale name (defaults to active locale).
      */
     renderBrief(locale?: string): string;
-    /**
-     * Makes a clone of this Event object
-     * @deprecated
-     */
-    clone(): HolidayEvent;
 }
 /**
  * Because Asara B'Tevet often occurs twice in the same Gregorian year,
@@ -47,6 +41,11 @@ export declare class AsaraBTevetEvent extends HolidayEvent {
  * we subclass HolidayEvent to generate the correct URL.
  */
 export declare class ChanukahEvent extends HolidayEvent {
+    readonly chanukahDay?: number;
+    /**
+     * @param chanukahDay should be undefined for 1st night of Chanukah
+     */
+    constructor(date: HDate, desc: string, mask: number, chanukahDay?: number);
     urlDateSuffix(): string;
 }
 /** Represents Rosh Hashana, the Jewish New Year */

package/dist/esm/HolidayEvent.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.10.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/core v6.0.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 import { isoDateString, Locale } from '@hebcal/hdate';
 import { Event, flags } from './event.js';
 import { holidayDesc } from './staticHolidays.js';
@@ -18,7 +18,7 @@ class HolidayEvent extends Event {
             .replace(/^Erev /, '');
     }
     url() {
-        const year = this.getDate().greg().getFullYear();
+        const year = this.greg().getFullYear();
         if (year < 100) {
             return undefined;
         }
@@ -29,7 +29,7 @@ class HolidayEvent extends Event {
         return this.getFlags() & flags.IL_ONLY ? url + '?i=on' : url;
     }
     urlDateSuffix() {
-        const year = this.getDate().greg().getFullYear();
+        const year = this.greg().getFullYear();
         return String(year);
     }
     getEmoji() {
@@ -85,16 +85,6 @@ class HolidayEvent extends Event {
         const str = super.renderBrief(locale);
         return str.replace(/'/g, '’');
     }
-    /**
-     * Makes a clone of this Event object
-     * @deprecated
-     */
-    clone() {
-        const ev = new HolidayEvent(this.date, this.desc, this.mask);
-        // overwrite all enumerable properties
-        Object.assign(ev, this);
-        return ev;
-    }
 }
 /**
  * Because Asara B'Tevet often occurs twice in the same Gregorian year,
@@ -102,17 +92,42 @@ class HolidayEvent extends Event {
  */
 class AsaraBTevetEvent extends HolidayEvent {
     urlDateSuffix() {
-        const isoDate = isoDateString(this.getDate().greg());
+        const isoDate = isoDateString(this.greg());
         return isoDate.replace(/-/g, '');
     }
 }
+const chanukahEmoji = '🕎';
+const KEYCAP_DIGITS = [
+    '0️⃣',
+    '1️⃣',
+    '2️⃣',
+    '3️⃣',
+    '4️⃣',
+    '5️⃣',
+    '6️⃣',
+    '7️⃣',
+    '8️⃣',
+    '9️⃣',
+];
 /**
  * Because Chanukah sometimes starts in December and ends in January,
  * we subclass HolidayEvent to generate the correct URL.
  */
 class ChanukahEvent extends HolidayEvent {
+    /**
+     * @param chanukahDay should be undefined for 1st night of Chanukah
+     */
+    constructor(date, desc, mask, chanukahDay) {
+        super(date, desc, mask);
+        this.chanukahDay = chanukahDay;
+        this.emoji = chanukahEmoji;
+        if (chanukahDay !== 8) {
+            const candles = chanukahDay ? chanukahDay + 1 : 1;
+            this.emoji += KEYCAP_DIGITS[candles];
+        }
+    }
     urlDateSuffix() {
-        const dt = this.getDate().greg();
+        const dt = this.greg();
         let year = dt.getFullYear();
         if (dt.getMonth() === 0) {
             year--;

package/dist/esm/HolidayEvent.js.map

@@ -1 +1 @@
-{"version":3,"file":"HolidayEvent.js","sources":["../../../src/HolidayEvent.ts"],"sourcesContent":["import {HDate, Locale, isoDateString} from '@hebcal/hdate';\nimport {Event, flags} from './event';\nimport {holidayDesc as hdesc} from './staticHolidays';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\n/** Represents a built-in holiday like Pesach, Purim or Tu BiShvat */\nexport class HolidayEvent extends Event {\n  /** During Sukkot or Pesach */\n  cholHaMoedDay?: number;\n  chanukahDay?: number;\n  /**\n   * `true` if the fast day was postponed a day to avoid Shabbat.\n   * - Tish'a B'Av postponed from the 9th to the 10th\n   * - Tzom Tammuz postponed from the 17th to the 18th\n   */\n  observed?: boolean;\n\n  basename(): string {\n    return this.getDesc()\n      .replace(/ \\d{4}$/, '')\n      .replace(/ \\(CH''M\\)$/, '')\n      .replace(/ \\(observed\\)$/, '')\n      .replace(/ \\(Hoshana Raba\\)$/, '')\n      .replace(/ [IV]+$/, '')\n      .replace(/: \\d Candles?$/, '')\n      .replace(/: 8th Day$/, '')\n      .replace(/^Erev /, '');\n  }\n\n  url(): string | undefined {\n    const year = this.getDate().greg().getFullYear();\n    if (year < 100) {\n      return undefined;\n    }\n    const url =\n      'https://www.hebcal.com/holidays/' +\n      this.basename().toLowerCase().replace(/'/g, '').replace(/ /g, '-') +\n      '-' +\n      this.urlDateSuffix();\n    return this.getFlags() & flags.IL_ONLY ? url + '?i=on' : url;\n  }\n\n  urlDateSuffix(): string {\n    const year = this.getDate().greg().getFullYear();\n    return String(year);\n  }\n\n  getEmoji(): string {\n    if (this.emoji) {\n      return this.emoji;\n    } else if (this.getFlags() & flags.SPECIAL_SHABBAT) {\n      return '🕍';\n    } else {\n      return '✡️';\n    }\n  }\n\n  getCategories(): string[] {\n    if (this.cholHaMoedDay) {\n      return ['holiday', 'major', 'cholhamoed'];\n    }\n    const cats = super.getCategories();\n    if (cats[0] !== 'unknown') {\n      return cats;\n    }\n    // Don't depend on flags.MINOR_HOLIDAY always being set. Look for minor holidays.\n    const desc = this.getDesc();\n    switch (desc) {\n      case hdesc.LAG_BAOMER:\n      case hdesc.LEIL_SELICHOT:\n      case hdesc.PESACH_SHENI:\n      case hdesc.EREV_PURIM:\n      case hdesc.PURIM_KATAN:\n      case hdesc.SHUSHAN_PURIM:\n      case hdesc.TU_BAV:\n      case hdesc.TU_BISHVAT:\n      case hdesc.ROSH_HASHANA_LABEHEMOT:\n        return ['holiday', 'minor'];\n    }\n\n    return ['holiday', 'major'];\n  }\n  /**\n   * Returns (translated) description of this event\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    const str = super.render(locale);\n    return str.replace(/'/g, '’');\n  }\n  /**\n   * Returns a brief (translated) description of this event.\n   * For most events, this is the same as render(). For some events, it procudes\n   * a shorter text (e.g. without a time or added description).\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  renderBrief(locale?: string): string {\n    const str = super.renderBrief(locale);\n    return str.replace(/'/g, '’');\n  }\n  /**\n   * Makes a clone of this Event object\n   * @deprecated\n   */\n  clone(): HolidayEvent {\n    const ev = new HolidayEvent(this.date, this.desc, this.mask);\n    // overwrite all enumerable properties\n    Object.assign(ev, this);\n    return ev;\n  }\n}\n\n/**\n * Because Asara B'Tevet often occurs twice in the same Gregorian year,\n * we subclass HolidayEvent to generate the correct URL.\n */\nexport class AsaraBTevetEvent extends HolidayEvent {\n  urlDateSuffix(): string {\n    const isoDate = isoDateString(this.getDate().greg());\n    return isoDate.replace(/-/g, '');\n  }\n}\n\n/**\n * Because Chanukah sometimes starts in December and ends in January,\n * we subclass HolidayEvent to generate the correct URL.\n */\nexport class ChanukahEvent extends HolidayEvent {\n  urlDateSuffix(): string {\n    const dt = this.getDate().greg();\n    let year = dt.getFullYear();\n    if (dt.getMonth() === 0) {\n      year--;\n    }\n    return String(year);\n  }\n}\n\n/** Represents Rosh Hashana, the Jewish New Year */\nexport class RoshHashanaEvent extends HolidayEvent {\n  private readonly hyear: number;\n  /**\n   * @private\n   * @param date Hebrew date event occurs\n   * @param hyear Hebrew year\n   * @param mask optional holiday flags\n   */\n  constructor(date: HDate, hyear: number, mask: number) {\n    super(date, `Rosh Hashana ${hyear}`, mask);\n    this.hyear = hyear;\n  }\n  /**\n   * Returns (translated) description of this event\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    return Locale.gettext('Rosh Hashana', locale) + ' ' + this.hyear;\n  }\n\n  getEmoji(): string {\n    return '🍏🍯';\n  }\n}\n\nconst roshChodeshStr = 'Rosh Chodesh';\n\n/** Represents Rosh Chodesh, the beginning of a new month */\nexport class RoshChodeshEvent extends HolidayEvent {\n  /**\n   * Constructs Rosh Chodesh event\n   * @param date Hebrew date event occurs\n   * @param monthName Hebrew month name (not translated)\n   */\n  constructor(date: HDate, monthName: string) {\n    super(date, `${roshChodeshStr} ${monthName}`, flags.ROSH_CHODESH);\n  }\n  /**\n   * Returns (translated) description of this event\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    const monthName = this.getDesc().substring(roshChodeshStr.length + 1);\n    const monthName0 = Locale.gettext(monthName, locale);\n    const monthName1 = monthName0.replace(/'/g, '’');\n    return Locale.gettext(roshChodeshStr, locale) + ' ' + monthName1;\n  }\n\n  basename(): string {\n    return this.getDesc();\n  }\n\n  getEmoji(): string {\n    return this.emoji || '🌒';\n  }\n}\n"],"names":["hdesc"],"mappings":"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"}
+{"version":3,"file":"HolidayEvent.js","sources":["../../../src/HolidayEvent.ts"],"sourcesContent":["import {HDate, Locale, isoDateString} from '@hebcal/hdate';\nimport {Event, flags} from './event';\nimport {holidayDesc as hdesc} from './staticHolidays';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\n/** Represents a built-in holiday like Pesach, Purim or Tu BiShvat */\nexport class HolidayEvent extends Event {\n  /** During Sukkot or Pesach */\n  cholHaMoedDay?: number;\n  /**\n   * `true` if the fast day was postponed a day to avoid Shabbat.\n   * - Tish'a B'Av postponed from the 9th to the 10th\n   * - Tzom Tammuz postponed from the 17th to the 18th\n   */\n  observed?: boolean;\n\n  basename(): string {\n    return this.getDesc()\n      .replace(/ \\d{4}$/, '')\n      .replace(/ \\(CH''M\\)$/, '')\n      .replace(/ \\(observed\\)$/, '')\n      .replace(/ \\(Hoshana Raba\\)$/, '')\n      .replace(/ [IV]+$/, '')\n      .replace(/: \\d Candles?$/, '')\n      .replace(/: 8th Day$/, '')\n      .replace(/^Erev /, '');\n  }\n\n  url(): string | undefined {\n    const year = this.greg().getFullYear();\n    if (year < 100) {\n      return undefined;\n    }\n    const url =\n      'https://www.hebcal.com/holidays/' +\n      this.basename().toLowerCase().replace(/'/g, '').replace(/ /g, '-') +\n      '-' +\n      this.urlDateSuffix();\n    return this.getFlags() & flags.IL_ONLY ? url + '?i=on' : url;\n  }\n\n  urlDateSuffix(): string {\n    const year = this.greg().getFullYear();\n    return String(year);\n  }\n\n  getEmoji(): string {\n    if (this.emoji) {\n      return this.emoji;\n    } else if (this.getFlags() & flags.SPECIAL_SHABBAT) {\n      return '🕍';\n    } else {\n      return '✡️';\n    }\n  }\n\n  getCategories(): string[] {\n    if (this.cholHaMoedDay) {\n      return ['holiday', 'major', 'cholhamoed'];\n    }\n    const cats = super.getCategories();\n    if (cats[0] !== 'unknown') {\n      return cats;\n    }\n    // Don't depend on flags.MINOR_HOLIDAY always being set. Look for minor holidays.\n    const desc = this.getDesc();\n    switch (desc) {\n      case hdesc.LAG_BAOMER:\n      case hdesc.LEIL_SELICHOT:\n      case hdesc.PESACH_SHENI:\n      case hdesc.EREV_PURIM:\n      case hdesc.PURIM_KATAN:\n      case hdesc.SHUSHAN_PURIM:\n      case hdesc.TU_BAV:\n      case hdesc.TU_BISHVAT:\n      case hdesc.ROSH_HASHANA_LABEHEMOT:\n        return ['holiday', 'minor'];\n    }\n\n    return ['holiday', 'major'];\n  }\n  /**\n   * Returns (translated) description of this event\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    const str = super.render(locale);\n    return str.replace(/'/g, '’');\n  }\n  /**\n   * Returns a brief (translated) description of this event.\n   * For most events, this is the same as render(). For some events, it procudes\n   * a shorter text (e.g. without a time or added description).\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  renderBrief(locale?: string): string {\n    const str = super.renderBrief(locale);\n    return str.replace(/'/g, '’');\n  }\n}\n\n/**\n * Because Asara B'Tevet often occurs twice in the same Gregorian year,\n * we subclass HolidayEvent to generate the correct URL.\n */\nexport class AsaraBTevetEvent extends HolidayEvent {\n  urlDateSuffix(): string {\n    const isoDate = isoDateString(this.greg());\n    return isoDate.replace(/-/g, '');\n  }\n}\n\nconst chanukahEmoji = '🕎';\nconst KEYCAP_DIGITS = [\n  '0️⃣',\n  '1️⃣',\n  '2️⃣',\n  '3️⃣',\n  '4️⃣',\n  '5️⃣',\n  '6️⃣',\n  '7️⃣',\n  '8️⃣',\n  '9️⃣',\n] as const;\n\n/**\n * Because Chanukah sometimes starts in December and ends in January,\n * we subclass HolidayEvent to generate the correct URL.\n */\nexport class ChanukahEvent extends HolidayEvent {\n  readonly chanukahDay?: number;\n  /**\n   * @param chanukahDay should be undefined for 1st night of Chanukah\n   */\n  constructor(date: HDate, desc: string, mask: number, chanukahDay?: number) {\n    super(date, desc, mask);\n    this.chanukahDay = chanukahDay;\n    this.emoji = chanukahEmoji;\n    if (chanukahDay !== 8) {\n      const candles = chanukahDay ? chanukahDay + 1 : 1;\n      this.emoji += KEYCAP_DIGITS[candles];\n    }\n  }\n  urlDateSuffix(): string {\n    const dt = this.greg();\n    let year = dt.getFullYear();\n    if (dt.getMonth() === 0) {\n      year--;\n    }\n    return String(year);\n  }\n}\n\n/** Represents Rosh Hashana, the Jewish New Year */\nexport class RoshHashanaEvent extends HolidayEvent {\n  private readonly hyear: number;\n  /**\n   * @private\n   * @param date Hebrew date event occurs\n   * @param hyear Hebrew year\n   * @param mask optional holiday flags\n   */\n  constructor(date: HDate, hyear: number, mask: number) {\n    super(date, `Rosh Hashana ${hyear}`, mask);\n    this.hyear = hyear;\n  }\n  /**\n   * Returns (translated) description of this event\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    return Locale.gettext('Rosh Hashana', locale) + ' ' + this.hyear;\n  }\n\n  getEmoji(): string {\n    return '🍏🍯';\n  }\n}\n\nconst roshChodeshStr = 'Rosh Chodesh';\n\n/** Represents Rosh Chodesh, the beginning of a new month */\nexport class RoshChodeshEvent extends HolidayEvent {\n  /**\n   * Constructs Rosh Chodesh event\n   * @param date Hebrew date event occurs\n   * @param monthName Hebrew month name (not translated)\n   */\n  constructor(date: HDate, monthName: string) {\n    super(date, `${roshChodeshStr} ${monthName}`, flags.ROSH_CHODESH);\n  }\n  /**\n   * Returns (translated) description of this event\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    const monthName = this.getDesc().substring(roshChodeshStr.length + 1);\n    const monthName0 = Locale.gettext(monthName, locale);\n    const monthName1 = monthName0.replace(/'/g, '’');\n    return Locale.gettext(roshChodeshStr, locale) + ' ' + monthName1;\n  }\n\n  basename(): string {\n    return this.getDesc();\n  }\n\n  getEmoji(): string {\n    return this.emoji || '🌒';\n  }\n}\n"],"names":["hdesc"],"mappings":"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"}

package/dist/esm/MevarchimChodeshEvent.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.10.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/core v6.0.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 import { Locale, HDate, months } from '@hebcal/hdate';
 import { Event, flags } from './event.js';
 import { Molad } from './molad.js';

package/dist/esm/MevarchimChodeshEvent.js.map

@@ -1 +1 @@
-{"version":3,"file":"MevarchimChodeshEvent.js","sources":["../../../src/MevarchimChodeshEvent.ts"],"sourcesContent":["import {HDate, Locale, months} from '@hebcal/hdate';\nimport {Event, flags} from './event';\nimport {Molad} from './molad';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\nconst mevarchimChodeshStr = 'Shabbat Mevarchim Chodesh';\n\n/** Represents Mevarchim haChodesh, the announcement of the new month */\nexport class MevarchimChodeshEvent extends Event {\n  readonly monthName: string;\n  /**\n   * Constructs Mevarchim haChodesh event\n   * @param date Hebrew date event occurs\n   * @param monthName Hebrew month name (not translated)\n   * @param [memo]\n   * @param locale Optional locale name\n   */\n  constructor(date: HDate, monthName: string, memo: string, locale?: string) {\n    super(date, `${mevarchimChodeshStr} ${monthName}`, flags.SHABBAT_MEVARCHIM);\n    this.monthName = Locale.gettext(monthName, locale);\n    if (memo) {\n      this.memo = memo;\n    } else {\n      const hyear = date.getFullYear();\n      const hmonth = date.getMonth();\n      const monNext =\n        hmonth === HDate.monthsInYear(hyear) ? months.NISAN : hmonth + 1;\n      const molad = new Molad(hyear, monNext);\n      this.memo = molad.render('en', {hour12: false});\n    }\n  }\n\n  basename(): string {\n    return this.getDesc();\n  }\n  /**\n   * Returns (translated) description of this event\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    const monthName0 = Locale.gettext(this.monthName, locale);\n    const monthName = monthName0.replace(/'/g, '’');\n    return Locale.gettext(mevarchimChodeshStr, locale) + ' ' + monthName;\n  }\n  /**\n   * Returns (translated) description of this event\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  renderBrief(locale?: string): string {\n    const str = this.render(locale);\n    const space = str.indexOf(' ');\n    return str.substring(space + 1);\n  }\n}\n"],"names":[],"mappings":";;;;;;AAKA,MAAM,mBAAmB,GAAG,2BAA2B;AAEvD;AACM,MAAO,qBAAsB,SAAQ,KAAK,CAAA;AAE9C;;;;;;AAMG;AACH,IAAA,WAAA,CAAY,IAAW,EAAE,SAAiB,EAAE,IAAY,EAAE,MAAe,EAAA;AACvE,QAAA,KAAK,CAAC,IAAI,EAAE,CAAA,EAAG,mBAAmB,CAAA,CAAA,EAAI,SAAS,CAAA,CAAE,EAAE,KAAK,CAAC,iBAAiB,CAAC;QAC3E,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;QAClD,IAAI,IAAI,EAAE;AACR,YAAA,IAAI,CAAC,IAAI,GAAG,IAAI;;aACX;AACL,YAAA,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE;AAChC,YAAA,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE;YAC9B,MAAM,OAAO,GACX,MAAM,KAAK,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,GAAG,MAAM,GAAG,CAAC;YAClE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC;AACvC,YAAA,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAC,MAAM,EAAE,KAAK,EAAC,CAAC;;;IAInD,QAAQ,GAAA;AACN,QAAA,OAAO,IAAI,CAAC,OAAO,EAAE;;AAEvB;;;AAGG;AACH,IAAA,MAAM,CAAC,MAAe,EAAA;AACpB,QAAA,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC;QACzD,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;AAC/C,QAAA,OAAO,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE,MAAM,CAAC,GAAG,GAAG,GAAG,SAAS;;AAEtE;;;AAGG;AACH,IAAA,WAAW,CAAC,MAAe,EAAA;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;QAC9B,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC;;AAElC;;;;"}
+{"version":3,"file":"MevarchimChodeshEvent.js","sources":["../../../src/MevarchimChodeshEvent.ts"],"sourcesContent":["import {HDate, Locale, months} from '@hebcal/hdate';\nimport {Event, flags} from './event';\nimport {Molad} from './molad';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\nconst mevarchimChodeshStr = 'Shabbat Mevarchim Chodesh';\n\n/** Represents Mevarchim haChodesh, the announcement of the new month */\nexport class MevarchimChodeshEvent extends Event {\n  readonly monthName: string;\n  /**\n   * Constructs Mevarchim haChodesh event\n   * @param date Hebrew date event occurs\n   * @param monthName Hebrew month name (not translated)\n   * @param [memo]\n   * @param locale Optional locale name\n   */\n  constructor(date: HDate, monthName: string, memo: string, locale?: string) {\n    super(date, `${mevarchimChodeshStr} ${monthName}`, flags.SHABBAT_MEVARCHIM);\n    this.monthName = Locale.gettext(monthName, locale);\n    if (memo) {\n      this.memo = memo;\n    } else {\n      const hyear = date.getFullYear();\n      const hmonth = date.getMonth();\n      const monNext =\n        hmonth === HDate.monthsInYear(hyear) ? months.NISAN : hmonth + 1;\n      const molad = new Molad(hyear, monNext);\n      this.memo = molad.render('en', {hour12: false});\n    }\n  }\n\n  basename(): string {\n    return this.getDesc();\n  }\n  /**\n   * Returns (translated) description of this event\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    const monthName0 = Locale.gettext(this.monthName, locale);\n    const monthName = monthName0.replace(/'/g, '’');\n    return Locale.gettext(mevarchimChodeshStr, locale) + ' ' + monthName;\n  }\n  /**\n   * Returns (translated) description of this event\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  renderBrief(locale?: string): string {\n    const str = this.render(locale);\n    const space = str.indexOf(' ');\n    return str.substring(space + 1);\n  }\n}\n"],"names":[],"mappings":";;;;;;AAKA,MAAM,mBAAmB,GAAG,2BAA2B;AAEvD;AACM,MAAO,qBAAsB,SAAQ,KAAK,CAAA;AAE9C;;;;;;AAMG;AACH,IAAA,WAAA,CAAY,IAAW,EAAE,SAAiB,EAAE,IAAY,EAAE,MAAe,EAAA;AACvE,QAAA,KAAK,CAAC,IAAI,EAAE,CAAA,EAAG,mBAAmB,CAAA,CAAA,EAAI,SAAS,CAAA,CAAE,EAAE,KAAK,CAAC,iBAAiB,CAAC;QAC3E,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;QAClD,IAAI,IAAI,EAAE;AACR,YAAA,IAAI,CAAC,IAAI,GAAG,IAAI;QAClB;aAAO;AACL,YAAA,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE;AAChC,YAAA,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE;YAC9B,MAAM,OAAO,GACX,MAAM,KAAK,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,GAAG,MAAM,GAAG,CAAC;YAClE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC;AACvC,YAAA,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAC,MAAM,EAAE,KAAK,EAAC,CAAC;QACjD;IACF;IAEA,QAAQ,GAAA;AACN,QAAA,OAAO,IAAI,CAAC,OAAO,EAAE;IACvB;AACA;;;AAGG;AACH,IAAA,MAAM,CAAC,MAAe,EAAA;AACpB,QAAA,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC;QACzD,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;AAC/C,QAAA,OAAO,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE,MAAM,CAAC,GAAG,GAAG,GAAG,SAAS;IACtE;AACA;;;AAGG;AACH,IAAA,WAAW,CAAC,MAAe,EAAA;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;QAC9B,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC;IACjC;AACD;;;;"}

package/dist/esm/ParshaEvent.d.ts

@@ -1,18 +1,12 @@
 import { Event } from './event';
-import { HDate } from '@hebcal/hdate';
+import { SedraResult } from './sedra';
 import './locale';
 /**
  * Represents one of 54 weekly Torah portions, always on a Saturday
  */
 export declare class ParshaEvent extends Event {
-    readonly parsha: string[];
-    readonly il: boolean;
-    readonly num: number | number[];
-    /**
-     * @param parsha - untranslated name of single or double parsha,
-     *   such as ['Bereshit'] or ['Achrei Mot', 'Kedoshim']
-     */
-    constructor(date: HDate, parsha: string[], il?: boolean, num?: number | number[]);
+    readonly p: SedraResult;
+    constructor(parsha: SedraResult);
     /**
      * @param [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
      */

package/dist/esm/ParshaEvent.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.10.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/core v6.0.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 import { Event, flags } from './event.js';
 import { isoDateString } from '@hebcal/hdate';
 import { renderParshaName } from './parshaName.js';
@@ -8,31 +8,22 @@ import './locale.js';
  * Represents one of 54 weekly Torah portions, always on a Saturday
  */
 class ParshaEvent extends Event {
-    /**
-     * @param parsha - untranslated name of single or double parsha,
-     *   such as ['Bereshit'] or ['Achrei Mot', 'Kedoshim']
-     */
-    constructor(date, parsha, il = false, num = -1) {
-        if (!Array.isArray(parsha) || parsha.length === 0 || parsha.length > 2) {
-            throw new TypeError('Bad parsha argument');
-        }
-        const desc = 'Parashat ' + parsha.join('-');
-        super(date, desc, flags.PARSHA_HASHAVUA);
-        this.parsha = parsha;
-        this.il = Boolean(il);
-        this.num = num || -1;
+    constructor(parsha) {
+        const desc = 'Parashat ' + parsha.parsha.join('-');
+        super(parsha.hdate, desc, flags.PARSHA_HASHAVUA);
+        this.p = parsha;
     }
     /**
      * @param [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
      */
     render(locale) {
-        return renderParshaName(this.parsha, locale);
+        return renderParshaName(this.p.parsha, locale);
     }
     basename() {
-        return this.parsha.join('-');
+        return this.p.parsha.join('-');
     }
     url() {
-        const year = this.getDate().greg().getFullYear();
+        const year = this.greg().getFullYear();
         if (year < 100) {
             return undefined;
         }
@@ -41,10 +32,10 @@ class ParshaEvent extends Event {
             this.basename().toLowerCase().replace(/'/g, '').replace(/ /g, '-') +
             '-' +
             dt;
-        return this.il ? url + '?i=on' : url;
+        return this.p.il ? url + '?i=on' : url;
     }
     urlDateSuffix() {
-        const isoDate = isoDateString(this.getDate().greg());
+        const isoDate = isoDateString(this.greg());
         return isoDate.replace(/-/g, '');
     }
 }

package/dist/esm/ParshaEvent.js.map

@@ -1 +1 @@
-{"version":3,"file":"ParshaEvent.js","sources":["../../../src/ParshaEvent.ts"],"sourcesContent":["import {Event, flags} from './event';\nimport {HDate, isoDateString} from '@hebcal/hdate';\nimport {renderParshaName} from './parshaName';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\n/**\n * Represents one of 54 weekly Torah portions, always on a Saturday\n */\nexport class ParshaEvent extends Event {\n  readonly parsha: string[];\n  readonly il: boolean;\n  readonly num: number | number[];\n  /**\n   * @param parsha - untranslated name of single or double parsha,\n   *   such as ['Bereshit'] or ['Achrei Mot', 'Kedoshim']\n   */\n  constructor(\n    date: HDate,\n    parsha: string[],\n    il = false,\n    num: number | number[] = -1\n  ) {\n    if (!Array.isArray(parsha) || parsha.length === 0 || parsha.length > 2) {\n      throw new TypeError('Bad parsha argument');\n    }\n    const desc = 'Parashat ' + parsha.join('-');\n    super(date, desc, flags.PARSHA_HASHAVUA);\n    this.parsha = parsha;\n    this.il = Boolean(il);\n    this.num = num || -1;\n  }\n  /**\n   * @param [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.\n   */\n  render(locale?: string): string {\n    return renderParshaName(this.parsha, locale);\n  }\n\n  basename(): string {\n    return this.parsha.join('-');\n  }\n\n  url(): string | undefined {\n    const year = this.getDate().greg().getFullYear();\n    if (year < 100) {\n      return undefined;\n    }\n    const dt = this.urlDateSuffix();\n    const url =\n      'https://www.hebcal.com/sedrot/' +\n      this.basename().toLowerCase().replace(/'/g, '').replace(/ /g, '-') +\n      '-' +\n      dt;\n    return this.il ? url + '?i=on' : url;\n  }\n\n  urlDateSuffix(): string {\n    const isoDate = isoDateString(this.getDate().greg());\n    return isoDate.replace(/-/g, '');\n  }\n}\n"],"names":[],"mappings":";;;;;;AAKA;;AAEG;AACG,MAAO,WAAY,SAAQ,KAAK,CAAA;AAIpC;;;AAGG;IACH,WAAA,CACE,IAAW,EACX,MAAgB,EAChB,EAAE,GAAG,KAAK,EACV,GAAA,GAAyB,EAAE,EAAA;QAE3B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;AACtE,YAAA,MAAM,IAAI,SAAS,CAAC,qBAAqB,CAAC;;QAE5C,MAAM,IAAI,GAAG,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3C,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC;AACxC,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM;AACpB,QAAA,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;AACrB,QAAA,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,EAAE;;AAEtB;;AAEG;AACH,IAAA,MAAM,CAAC,MAAe,EAAA;QACpB,OAAO,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;;IAG9C,QAAQ,GAAA;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;;IAG9B,GAAG,GAAA;AACD,QAAA,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE;AAChD,QAAA,IAAI,IAAI,GAAG,GAAG,EAAE;AACd,YAAA,OAAO,SAAS;;AAElB,QAAA,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,EAAE;QAC/B,MAAM,GAAG,GACP,gCAAgC;AAChC,YAAA,IAAI,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;YAClE,GAAG;AACH,YAAA,EAAE;AACJ,QAAA,OAAO,IAAI,CAAC,EAAE,GAAG,GAAG,GAAG,OAAO,GAAG,GAAG;;IAGtC,aAAa,GAAA;AACX,QAAA,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC;QACpD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;;AAEnC;;;;"}
+{"version":3,"file":"ParshaEvent.js","sources":["../../../src/ParshaEvent.ts"],"sourcesContent":["import {Event, flags} from './event';\nimport {isoDateString} from '@hebcal/hdate';\nimport {renderParshaName} from './parshaName';\nimport {SedraResult} from './sedra';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\n/**\n * Represents one of 54 weekly Torah portions, always on a Saturday\n */\nexport class ParshaEvent extends Event {\n  readonly p: SedraResult;\n  constructor(parsha: SedraResult) {\n    const desc = 'Parashat ' + parsha.parsha.join('-');\n    super(parsha.hdate, desc, flags.PARSHA_HASHAVUA);\n    this.p = parsha;\n  }\n  /**\n   * @param [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.\n   */\n  render(locale?: string): string {\n    return renderParshaName(this.p.parsha, locale);\n  }\n\n  basename(): string {\n    return this.p.parsha.join('-');\n  }\n\n  url(): string | undefined {\n    const year = this.greg().getFullYear();\n    if (year < 100) {\n      return undefined;\n    }\n    const dt = this.urlDateSuffix();\n    const url =\n      'https://www.hebcal.com/sedrot/' +\n      this.basename().toLowerCase().replace(/'/g, '').replace(/ /g, '-') +\n      '-' +\n      dt;\n    return this.p.il ? url + '?i=on' : url;\n  }\n\n  urlDateSuffix(): string {\n    const isoDate = isoDateString(this.greg());\n    return isoDate.replace(/-/g, '');\n  }\n}\n"],"names":[],"mappings":";;;;;;AAMA;;AAEG;AACG,MAAO,WAAY,SAAQ,KAAK,CAAA;AAEpC,IAAA,WAAA,CAAY,MAAmB,EAAA;AAC7B,QAAA,MAAM,IAAI,GAAG,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;QAClD,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC;AAChD,QAAA,IAAI,CAAC,CAAC,GAAG,MAAM;IACjB;AACA;;AAEG;AACH,IAAA,MAAM,CAAC,MAAe,EAAA;QACpB,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC;IAChD;IAEA,QAAQ,GAAA;QACN,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;IAChC;IAEA,GAAG,GAAA;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE;AACtC,QAAA,IAAI,IAAI,GAAG,GAAG,EAAE;AACd,YAAA,OAAO,SAAS;QAClB;AACA,QAAA,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,EAAE;QAC/B,MAAM,GAAG,GACP,gCAAgC;AAChC,YAAA,IAAI,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;YAClE,GAAG;AACH,YAAA,EAAE;AACJ,QAAA,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG,OAAO,GAAG,GAAG;IACxC;IAEA,aAAa,GAAA;QACX,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC1C,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;IAClC;AACD;;;;"}

package/dist/esm/TimedEvent.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.10.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/core v6.0.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 import { Locale } from '@hebcal/hdate';
 import { Event } from './event.js';
 import { reformatTimeStr } from './reformatTimeStr.js';

package/dist/esm/TimedEvent.js.map

@@ -1 +1 @@
-{"version":3,"file":"TimedEvent.js","sources":["../../../src/TimedEvent.ts"],"sourcesContent":["import {HDate, Locale} from '@hebcal/hdate';\nimport {CalOptions} from './CalOptions';\nimport {Location} from './location';\nimport {Event} from './event';\nimport {reformatTimeStr} from './reformatTimeStr';\nimport {Zmanim} from './zmanim';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\n/** An event that has an `eventTime` and `eventTimeStr` */\nexport class TimedEvent extends Event {\n  readonly eventTime: Date;\n  readonly location: Location;\n  readonly eventTimeStr: string;\n  readonly fmtTime: string;\n  readonly linkedEvent?: Event;\n  /**\n   * @param desc Description (not translated)\n   */\n  constructor(\n    date: HDate,\n    desc: string,\n    mask: number,\n    eventTime: Date,\n    location: Location,\n    linkedEvent?: Event,\n    options?: CalOptions\n  ) {\n    super(date, desc, mask);\n    this.eventTime = Zmanim.roundTime(eventTime);\n    this.location = location;\n    const timeFormat = location.getTimeFormatter();\n    this.eventTimeStr = Zmanim.formatTime(this.eventTime, timeFormat);\n    const opts = {...options, location};\n    this.fmtTime = reformatTimeStr(this.eventTimeStr, 'pm', opts);\n    if (typeof linkedEvent !== 'undefined') {\n      this.linkedEvent = linkedEvent;\n    }\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    return Locale.gettext(this.getDesc(), locale) + ': ' + this.fmtTime;\n  }\n  /**\n   * Returns translation of \"Candle lighting\" without the time.\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  renderBrief(locale?: string): string {\n    return Locale.gettext(this.getDesc(), locale);\n  }\n\n  getCategories(): string[] {\n    const desc = this.getDesc();\n    switch (desc) {\n      // LIGHT_CANDLES or LIGHT_CANDLES_TZEIS\n      case 'Candle lighting':\n        return ['candles'];\n      // YOM_TOV_ENDS\n      case 'Havdalah':\n        return ['havdalah'];\n      // flags.MINOR_FAST or flags.MAJOR_FAST\n      case 'Fast begins':\n      case 'Fast ends':\n        return ['zmanim', 'fast'];\n    }\n    /* NOTREACHED */\n    return ['unknown'];\n  }\n}\n\n/** Candle lighting before Shabbat or holiday */\nexport class CandleLightingEvent extends TimedEvent {\n  constructor(\n    date: HDate,\n    mask: number,\n    eventTime: Date,\n    location: Location,\n    linkedEvent?: Event,\n    options?: CalOptions\n  ) {\n    super(\n      date,\n      'Candle lighting',\n      mask,\n      eventTime,\n      location,\n      linkedEvent,\n      options\n    );\n  }\n\n  getEmoji(): string {\n    return '🕯️';\n  }\n}\n\n/** Havdalah after Shabbat or holiday */\nexport class HavdalahEvent extends TimedEvent {\n  private readonly havdalahMins?: number;\n  constructor(\n    date: HDate,\n    mask: number,\n    eventTime: Date,\n    location: Location,\n    havdalahMins?: number,\n    linkedEvent?: Event,\n    options?: CalOptions\n  ) {\n    super(date, 'Havdalah', mask, eventTime, location, linkedEvent, options);\n    if (havdalahMins) {\n      this.havdalahMins = havdalahMins;\n    }\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    return this.renderBrief(locale) + ': ' + this.fmtTime;\n  }\n  /**\n   * Returns translation of \"Havdalah\" without the time.\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  renderBrief(locale?: string): string {\n    let str = Locale.gettext(this.getDesc(), locale);\n    if (this.havdalahMins) {\n      const min = Locale.gettext('min', locale);\n      str += ` (${this.havdalahMins} ${min})`;\n    }\n    return str;\n  }\n\n  getEmoji(): string {\n    return '✨';\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"TimedEvent.js","sources":["../../../src/TimedEvent.ts"],"sourcesContent":["import {HDate, Locale} from '@hebcal/hdate';\nimport {CalOptions} from './CalOptions';\nimport {Location} from './location';\nimport {Event} from './event';\nimport {reformatTimeStr} from './reformatTimeStr';\nimport {Zmanim} from './zmanim';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\n/** An event that has an `eventTime` and `eventTimeStr` */\nexport class TimedEvent extends Event {\n  readonly eventTime: Date;\n  readonly location: Location;\n  readonly eventTimeStr: string;\n  readonly fmtTime: string;\n  readonly linkedEvent?: Event;\n  /**\n   * @param desc Description (not translated)\n   */\n  constructor(\n    date: HDate,\n    desc: string,\n    mask: number,\n    eventTime: Date,\n    location: Location,\n    linkedEvent?: Event,\n    options?: CalOptions\n  ) {\n    super(date, desc, mask);\n    this.eventTime = Zmanim.roundTime(eventTime);\n    this.location = location;\n    const timeFormat = location.getTimeFormatter();\n    this.eventTimeStr = Zmanim.formatTime(this.eventTime, timeFormat);\n    const opts = {...options, location};\n    this.fmtTime = reformatTimeStr(this.eventTimeStr, 'pm', opts);\n    if (typeof linkedEvent !== 'undefined') {\n      this.linkedEvent = linkedEvent;\n    }\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    return Locale.gettext(this.getDesc(), locale) + ': ' + this.fmtTime;\n  }\n  /**\n   * Returns translation of \"Candle lighting\" without the time.\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  renderBrief(locale?: string): string {\n    return Locale.gettext(this.getDesc(), locale);\n  }\n\n  getCategories(): string[] {\n    const desc = this.getDesc();\n    switch (desc) {\n      // LIGHT_CANDLES or LIGHT_CANDLES_TZEIS\n      case 'Candle lighting':\n        return ['candles'];\n      // YOM_TOV_ENDS\n      case 'Havdalah':\n        return ['havdalah'];\n      // flags.MINOR_FAST or flags.MAJOR_FAST\n      case 'Fast begins':\n      case 'Fast ends':\n        return ['zmanim', 'fast'];\n    }\n    /* NOTREACHED */\n    return ['unknown'];\n  }\n}\n\n/** Candle lighting before Shabbat or holiday */\nexport class CandleLightingEvent extends TimedEvent {\n  constructor(\n    date: HDate,\n    mask: number,\n    eventTime: Date,\n    location: Location,\n    linkedEvent?: Event,\n    options?: CalOptions\n  ) {\n    super(\n      date,\n      'Candle lighting',\n      mask,\n      eventTime,\n      location,\n      linkedEvent,\n      options\n    );\n  }\n\n  getEmoji(): string {\n    return '🕯️';\n  }\n}\n\n/** Havdalah after Shabbat or holiday */\nexport class HavdalahEvent extends TimedEvent {\n  private readonly havdalahMins?: number;\n  constructor(\n    date: HDate,\n    mask: number,\n    eventTime: Date,\n    location: Location,\n    havdalahMins?: number,\n    linkedEvent?: Event,\n    options?: CalOptions\n  ) {\n    super(date, 'Havdalah', mask, eventTime, location, linkedEvent, options);\n    if (havdalahMins) {\n      this.havdalahMins = havdalahMins;\n    }\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    return this.renderBrief(locale) + ': ' + this.fmtTime;\n  }\n  /**\n   * Returns translation of \"Havdalah\" without the time.\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  renderBrief(locale?: string): string {\n    let str = Locale.gettext(this.getDesc(), locale);\n    if (this.havdalahMins) {\n      const min = Locale.gettext('min', locale);\n      str += ` (${this.havdalahMins} ${min})`;\n    }\n    return str;\n  }\n\n  getEmoji(): string {\n    return '✨';\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/YomKippurKatanEvent.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.10.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/core v6.0.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 import { Locale } from '@hebcal/hdate';
 import { flags } from './event.js';
 import { HolidayEvent } from './HolidayEvent.js';

package/dist/esm/YomKippurKatanEvent.js.map

@@ -1 +1 @@
-{"version":3,"file":"YomKippurKatanEvent.js","sources":["../../../src/YomKippurKatanEvent.ts"],"sourcesContent":["import {HDate, Locale} from '@hebcal/hdate';\nimport {flags} from './event';\nimport {HolidayEvent} from './HolidayEvent';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\nconst ykk = 'Yom Kippur Katan';\n\n/** YKK is minor day of atonement on the day preceeding each Rosh Chodesh */\nexport class YomKippurKatanEvent extends HolidayEvent {\n  private readonly nextMonthName: string;\n  /**\n   * @private\n   * @param date Hebrew date event occurs\n   * @param nextMonthName name of the upcoming month\n   */\n  constructor(date: HDate, nextMonthName: string) {\n    super(\n      date,\n      `${ykk} ${nextMonthName}`,\n      flags.MINOR_FAST | flags.YOM_KIPPUR_KATAN\n    );\n    this.nextMonthName = nextMonthName;\n    this.memo = `Minor Day of Atonement on the day preceeding Rosh Chodesh ${nextMonthName}`;\n  }\n\n  basename(): string {\n    return this.getDesc();\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    const monthName0 = Locale.gettext(this.nextMonthName, locale);\n    const monthName = monthName0.replace(/'/g, '’');\n    return Locale.gettext(ykk, locale) + ' ' + monthName;\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  renderBrief(locale?: string): string {\n    return Locale.gettext(ykk, locale);\n  }\n\n  url(): string | undefined {\n    return undefined;\n  }\n}\n"],"names":[],"mappings":";;;;;;AAKA,MAAM,GAAG,GAAG,kBAAkB;AAE9B;AACM,MAAO,mBAAoB,SAAQ,YAAY,CAAA;AAEnD;;;;AAIG;IACH,WAAA,CAAY,IAAW,EAAE,aAAqB,EAAA;AAC5C,QAAA,KAAK,CACH,IAAI,EACJ,CAAA,EAAG,GAAG,IAAI,aAAa,CAAA,CAAE,EACzB,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,gBAAgB,CAC1C;AACD,QAAA,IAAI,CAAC,aAAa,GAAG,aAAa;AAClC,QAAA,IAAI,CAAC,IAAI,GAAG,CAAA,0DAAA,EAA6D,aAAa,EAAE;;IAG1F,QAAQ,GAAA;AACN,QAAA,OAAO,IAAI,CAAC,OAAO,EAAE;;AAEvB;;AAEG;AACH,IAAA,MAAM,CAAC,MAAe,EAAA;AACpB,QAAA,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC;QAC7D,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;AAC/C,QAAA,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,GAAG,SAAS;;AAEtD;;AAEG;AACH,IAAA,WAAW,CAAC,MAAe,EAAA;QACzB,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC;;IAGpC,GAAG,GAAA;AACD,QAAA,OAAO,SAAS;;AAEnB;;;;"}
+{"version":3,"file":"YomKippurKatanEvent.js","sources":["../../../src/YomKippurKatanEvent.ts"],"sourcesContent":["import {HDate, Locale} from '@hebcal/hdate';\nimport {flags} from './event';\nimport {HolidayEvent} from './HolidayEvent';\nimport './locale'; // Adds Hebrew and Ashkenazic translations\n\nconst ykk = 'Yom Kippur Katan';\n\n/** YKK is minor day of atonement on the day preceeding each Rosh Chodesh */\nexport class YomKippurKatanEvent extends HolidayEvent {\n  private readonly nextMonthName: string;\n  /**\n   * @private\n   * @param date Hebrew date event occurs\n   * @param nextMonthName name of the upcoming month\n   */\n  constructor(date: HDate, nextMonthName: string) {\n    super(\n      date,\n      `${ykk} ${nextMonthName}`,\n      flags.MINOR_FAST | flags.YOM_KIPPUR_KATAN\n    );\n    this.nextMonthName = nextMonthName;\n    this.memo = `Minor Day of Atonement on the day preceeding Rosh Chodesh ${nextMonthName}`;\n  }\n\n  basename(): string {\n    return this.getDesc();\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  render(locale?: string): string {\n    const monthName0 = Locale.gettext(this.nextMonthName, locale);\n    const monthName = monthName0.replace(/'/g, '’');\n    return Locale.gettext(ykk, locale) + ' ' + monthName;\n  }\n  /**\n   * @param [locale] Optional locale name (defaults to active locale).\n   */\n  renderBrief(locale?: string): string {\n    return Locale.gettext(ykk, locale);\n  }\n\n  url(): string | undefined {\n    return undefined;\n  }\n}\n"],"names":[],"mappings":";;;;;;AAKA,MAAM,GAAG,GAAG,kBAAkB;AAE9B;AACM,MAAO,mBAAoB,SAAQ,YAAY,CAAA;AAEnD;;;;AAIG;IACH,WAAA,CAAY,IAAW,EAAE,aAAqB,EAAA;AAC5C,QAAA,KAAK,CACH,IAAI,EACJ,CAAA,EAAG,GAAG,IAAI,aAAa,CAAA,CAAE,EACzB,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,gBAAgB,CAC1C;AACD,QAAA,IAAI,CAAC,aAAa,GAAG,aAAa;AAClC,QAAA,IAAI,CAAC,IAAI,GAAG,CAAA,0DAAA,EAA6D,aAAa,EAAE;IAC1F;IAEA,QAAQ,GAAA;AACN,QAAA,OAAO,IAAI,CAAC,OAAO,EAAE;IACvB;AACA;;AAEG;AACH,IAAA,MAAM,CAAC,MAAe,EAAA;AACpB,QAAA,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC;QAC7D,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;AAC/C,QAAA,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,GAAG,SAAS;IACtD;AACA;;AAEG;AACH,IAAA,WAAW,CAAC,MAAe,EAAA;QACzB,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC;IACpC;IAEA,GAAG,GAAA;AACD,QAAA,OAAO,SAAS;IAClB;AACD;;;;"}

package/dist/esm/ashkenazi.po.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.10.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/core v6.0.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 var poAshkenazi = { "headers": { "plural-forms": "nplurals=2; plural=(n > 1);", "language": "en_CA@ashkenazi" }, "contexts": { "": { "Shabbat": ["Shabbos"], "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"], "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"], "Asara B'Tevet": ["Asara B’Teves"], "Alot HaShachar": ["Alos HaShachar"], "Kriat Shema, sof zeman": ["Krias Shema, sof zman"], "Tefilah, sof zeman": ["Tefilah, sof zman"], "Kriat Shema, sof zeman (MGA)": ["Krias Shema, sof zman (MGA)"], "Tefilah, sof zeman (MGA)": ["Tefilah, sof zman (MGA)"], "Chatzot HaLailah": ["Chatzos HaLailah"], "Chatzot hayom": ["Chatzos"], "Tzeit HaKochavim": ["Tzeis HaKochavim"], "Birkat Hachamah": ["Birkas Hachamah"], "Shushan Purim Katan": ["Shushan Purim Koton"] } } };
 
 export { poAshkenazi as default };

package/dist/esm/calendar.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.10.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/core v6.0.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 import './locale.js';
 import { months, Locale, abs2greg, HDate } from '@hebcal/hdate';
 import { makeCandleEvent, makeFastStartEnd, makeWeekdayChanukahCandleLighting } from './candles.js';
@@ -131,18 +131,20 @@ function calendar(options = {}) {
     const il = (options.il = options.il || location.getIsrael() || false);
     const hasUserMask = typeof options.mask === 'number';
     options.mask = getMaskFromOptions(options);
-    if (options.ashkenazi || options.locale) {
-        if (options.locale && typeof options.locale !== 'string') {
-            throw new TypeError(`Invalid options.locale: ${options.locale}`);
+    if (options.locale) {
+        const locale = options.locale;
+        if (locale && typeof locale !== 'string') {
+            throw new TypeError(`Invalid options.locale: ${locale}`);
         }
-        const locale = options.ashkenazi ? 'ashkenazi' : options.locale;
-        const translationObj = Locale.useLocale(locale);
-        if (!translationObj) {
+        if (!Locale.hasLocale(locale)) {
             throw new TypeError(`Locale '${locale}' not found; did you forget to import @hebcal/locales?`);
         }
     }
+    else if (options.ashkenazi) {
+        options.locale = 'ashkenazi';
+    }
     else {
-        Locale.useLocale('en');
+        options.locale = 'en';
     }
     const evts = [];
     let sedra;
@@ -157,6 +159,7 @@ function calendar(options = {}) {
     const startGreg = abs2greg(startAbs);
     if (startGreg.getFullYear() < 100) {
         options.candlelighting = false;
+        options.sedrot = false;
     }
     for (let abs = startAbs; abs <= endAbs; abs++) {
         const hd = new HDate(abs);
@@ -177,14 +180,15 @@ function calendar(options = {}) {
         const isFriday = dow === FRI;
         const isSaturday = dow === SAT;
         let candlesEv;
-        const holidays = holidaysYear.get(hd.toString()) || [];
+        const holidays0 = holidaysYear.get(hd.toString()) || [];
+        const holidays = holidays0.filter(ev => ev.observedIn(il));
         for (const ev of holidays) {
             candlesEv = appendHolidayAndRelated(candlesEv, evts, ev, options, isFriday, isSaturday, hasUserMask);
         }
         if (options.sedrot && isSaturday) {
             const parsha0 = sedra.lookup(abs);
             if (!parsha0.chag) {
-                evts.push(new ParshaEvent(hd, parsha0.parsha, il, parsha0.num));
+                evts.push(new ParshaEvent(parsha0));
             }
         }
         if (options.yizkor) {
@@ -193,7 +197,7 @@ function calendar(options = {}) {
             if ((mm === months.TISHREI && (dd === 10 || dd === 22)) ||
                 (mm === NISAN && dd === (il ? 21 : 22)) ||
                 (mm === SIVAN && dd === (il ? 6 : 7))) {
-                const linkedEvent = holidays.filter(ev => ev.observedIn(il))[0];
+                const linkedEvent = holidays[0];
                 const ev = new Event(hd, 'Yizkor', flags.YIZKOR, {
                     emoji: '🕯️',
                     linkedEvent,
@@ -223,8 +227,13 @@ function calendar(options = {}) {
             candlesEv = makeCandleEvent(undefined, hd, options, isFriday, isSaturday);
             if (isFriday && candlesEv && sedra) {
                 const parsha = sedra.lookup(abs);
-                const pe = new ParshaEvent(hd.next(), parsha.parsha, il, parsha.num);
-                candlesEv.memo = pe.render(options.locale);
+                if (!parsha.chag) {
+                    const pe = new ParshaEvent(parsha);
+                    candlesEv.memo = pe.render(options.locale);
+                }
+                else {
+                    candlesEv.memo = Locale.gettext(parsha.parsha[0], options.locale);
+                }
             }
         }
         // suppress Havdalah when options.havdalahMins=0 or options.havdalahDeg=0
@@ -576,7 +585,7 @@ function appendHolidayAndRelated(candlesEv, events, ev, options, isFriday, isSat
             if (eFlags & CHANUKAH_CANDLES && candlesEv && !options.noHolidays) {
                 // Replace Chanukah event with a clone that includes candle lighting time.
                 // For clarity, allow a "duplicate" candle lighting event to remain for Shabbat
-                const chanukahEv = makeWeekdayChanukahCandleLighting(ev, hd, options);
+                const chanukahEv = makeWeekdayChanukahCandleLighting(ev, options);
                 if (chanukahEv) {
                     if (isFriday || isSaturday) {
                         chanukahEv.eventTime = candlesEv.eventTime;