@hebcal/rest-api 4.5.0 → 4.5.2

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/rest-api v4.5.0 */
+/*! @hebcal/rest-api v4.5.2 */
 'use strict';
 
 var core = require('@hebcal/core');
@@ -120,9 +120,6 @@ function pad4(number) {
 function toISOString(d) {
   return pad4(d.getFullYear()) + '-' + pad2(d.getMonth() + 1) + '-' + pad2(d.getDate());
 }
-const flagToCategory = [[core.flags.MAJOR_FAST, 'holiday', 'major', 'fast'], [core.flags.CHANUKAH_CANDLES, 'holiday', 'major'], [core.flags.DAF_YOMI, 'dafyomi'], [core.flags.HEBREW_DATE, 'hebdate'], [core.flags.MINOR_FAST, 'holiday', 'fast'], [core.flags.MINOR_HOLIDAY, 'holiday', 'minor'], [core.flags.MISHNA_YOMI, 'mishnayomi'], [core.flags.NACH_YOMI, 'nachyomi'], [core.flags.YERUSHALMI_YOMI, 'yerushalmi'], [core.flags.MODERN_HOLIDAY, 'holiday', 'modern'], [core.flags.MOLAD, 'molad'], [core.flags.OMER_COUNT, 'omer'], [core.flags.PARSHA_HASHAVUA, 'parashat'],
-// backwards-compat
-[core.flags.ROSH_CHODESH, 'roshchodesh'], [core.flags.SHABBAT_MEVARCHIM, 'mevarchim'], [core.flags.SPECIAL_SHABBAT, 'holiday', 'shabbat'], [core.flags.USER_EVENT, 'user']];
 
 /**
  * Returns a category and subcategory name
@@ -131,45 +128,10 @@ const flagToCategory = [[core.flags.MAJOR_FAST, 'holiday', 'major', 'fast'], [co
  */
 function getEventCategories(ev) {
   const desc = ev.getDesc();
-  switch (desc) {
-    // LIGHT_CANDLES or LIGHT_CANDLES_TZEIS
-    case 'Candle lighting':
-      return ['candles'];
-    // YOM_TOV_ENDS
-    case 'Havdalah':
-      return ['havdalah'];
-    // flags.MINOR_FAST or flags.MAJOR_FAST
-    case 'Fast begins':
-    case 'Fast ends':
-      return ['zmanim', 'fast'];
-    case 'Purim':
-      return ['holiday', 'major'];
-  }
-  if (ev.cholHaMoedDay) {
-    return ['holiday', 'major', 'cholhamoed'];
-  }
-  const mask = ev.getFlags();
-  for (let i = 0; i < flagToCategory.length; i++) {
-    const attrs = flagToCategory[i];
-    if (mask & attrs[0]) {
-      return attrs.slice(1);
-    }
-  }
-  // Don't depend on flags.MINOR_HOLIDAY always being set
-  switch (desc) {
-    case 'Lag BaOmer':
-    case 'Leil Selichot':
-    case 'Pesach Sheni':
-    case 'Erev Purim':
-    case 'Purim Katan':
-    case 'Shushan Purim':
-    case 'Tu B\'Av':
-    case 'Tu BiShvat':
-    case 'Rosh Hashana LaBehemot':
-      return ['holiday', 'minor'];
-    default:
-      return ['holiday', 'major'];
+  if (desc === 'Purim' || desc === 'Erev Purim') {
+    return ['holiday', 'major'];
   }
+  return ev.getCategories();
 }
 
 /**
@@ -231,7 +193,8 @@ function getCalendarTitle(events, options) {
  * @return {string}
  */
 function getHolidayDescription(ev, firstSentence = false) {
-  const str = holidayDescription[ev.getDesc()] || holidayDescription[ev.basename()] || '';
+  const str0 = holidayDescription[ev.getDesc()] || holidayDescription[ev.basename()] || '';
+  const str = str0.normalize();
   if (firstSentence && str) {
     const dot = str.indexOf('.');
     if (dot != -1) {
@@ -590,8 +553,8 @@ function eventToClassicApiObject(ev, options, leyning$1 = true) {
     };
   }
   const memo = ev.memo || holidayDescription[ev.basename()];
-  if (memo) {
-    result.memo = memo;
+  if (typeof memo === 'string' && memo.length !== 0) {
+    result.memo = memo.normalize();
   } else if (typeof ev.linkedEvent !== 'undefined') {
     result.memo = ev.linkedEvent.render(options.locale);
   }

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/rest-api v4.5.0 */
+/*! @hebcal/rest-api v4.5.2 */
 import { flags, HDate, HebrewCalendar, Zmanim, Locale, gematriya } from '@hebcal/core';
 import { getLeyningForParshaHaShavua, getLeyningForHoliday, formatAliyahWithBook } from '@hebcal/leyning';
 import { getTriennialForParshaHaShavua } from '@hebcal/triennial';
@@ -118,9 +118,6 @@ function pad4(number) {
 function toISOString(d) {
   return pad4(d.getFullYear()) + '-' + pad2(d.getMonth() + 1) + '-' + pad2(d.getDate());
 }
-const flagToCategory = [[flags.MAJOR_FAST, 'holiday', 'major', 'fast'], [flags.CHANUKAH_CANDLES, 'holiday', 'major'], [flags.DAF_YOMI, 'dafyomi'], [flags.HEBREW_DATE, 'hebdate'], [flags.MINOR_FAST, 'holiday', 'fast'], [flags.MINOR_HOLIDAY, 'holiday', 'minor'], [flags.MISHNA_YOMI, 'mishnayomi'], [flags.NACH_YOMI, 'nachyomi'], [flags.YERUSHALMI_YOMI, 'yerushalmi'], [flags.MODERN_HOLIDAY, 'holiday', 'modern'], [flags.MOLAD, 'molad'], [flags.OMER_COUNT, 'omer'], [flags.PARSHA_HASHAVUA, 'parashat'],
-// backwards-compat
-[flags.ROSH_CHODESH, 'roshchodesh'], [flags.SHABBAT_MEVARCHIM, 'mevarchim'], [flags.SPECIAL_SHABBAT, 'holiday', 'shabbat'], [flags.USER_EVENT, 'user']];
 
 /**
  * Returns a category and subcategory name
@@ -129,45 +126,10 @@ const flagToCategory = [[flags.MAJOR_FAST, 'holiday', 'major', 'fast'], [flags.C
  */
 function getEventCategories(ev) {
   const desc = ev.getDesc();
-  switch (desc) {
-    // LIGHT_CANDLES or LIGHT_CANDLES_TZEIS
-    case 'Candle lighting':
-      return ['candles'];
-    // YOM_TOV_ENDS
-    case 'Havdalah':
-      return ['havdalah'];
-    // flags.MINOR_FAST or flags.MAJOR_FAST
-    case 'Fast begins':
-    case 'Fast ends':
-      return ['zmanim', 'fast'];
-    case 'Purim':
-      return ['holiday', 'major'];
-  }
-  if (ev.cholHaMoedDay) {
-    return ['holiday', 'major', 'cholhamoed'];
-  }
-  const mask = ev.getFlags();
-  for (let i = 0; i < flagToCategory.length; i++) {
-    const attrs = flagToCategory[i];
-    if (mask & attrs[0]) {
-      return attrs.slice(1);
-    }
-  }
-  // Don't depend on flags.MINOR_HOLIDAY always being set
-  switch (desc) {
-    case 'Lag BaOmer':
-    case 'Leil Selichot':
-    case 'Pesach Sheni':
-    case 'Erev Purim':
-    case 'Purim Katan':
-    case 'Shushan Purim':
-    case 'Tu B\'Av':
-    case 'Tu BiShvat':
-    case 'Rosh Hashana LaBehemot':
-      return ['holiday', 'minor'];
-    default:
-      return ['holiday', 'major'];
+  if (desc === 'Purim' || desc === 'Erev Purim') {
+    return ['holiday', 'major'];
   }
+  return ev.getCategories();
 }
 
 /**
@@ -229,7 +191,8 @@ function getCalendarTitle(events, options) {
  * @return {string}
  */
 function getHolidayDescription(ev, firstSentence = false) {
-  const str = holidayDescription[ev.getDesc()] || holidayDescription[ev.basename()] || '';
+  const str0 = holidayDescription[ev.getDesc()] || holidayDescription[ev.basename()] || '';
+  const str = str0.normalize();
   if (firstSentence && str) {
     const dot = str.indexOf('.');
     if (dot != -1) {
@@ -588,8 +551,8 @@ function eventToClassicApiObject(ev, options, leyning = true) {
     };
   }
   const memo = ev.memo || holidayDescription[ev.basename()];
-  if (memo) {
-    result.memo = memo;
+  if (typeof memo === 'string' && memo.length !== 0) {
+    result.memo = memo.normalize();
   } else if (typeof ev.linkedEvent !== 'undefined') {
     result.memo = ev.linkedEvent.render(options.locale);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/rest-api",
-  "version": "4.5.0",
+  "version": "4.5.2",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -28,9 +28,9 @@
     "url": "https://github.com/hebcal/hebcal-rest-api/issues"
   },
   "dependencies": {
-    "@hebcal/core": "^4.0.0",
-    "@hebcal/leyning": "^7.3.0",
-    "@hebcal/triennial": "^1.2.0"
+    "@hebcal/core": "^4.3.1",
+    "@hebcal/leyning": "^7.4.3",
+    "@hebcal/triennial": "^1.3.2"
   },
   "scripts": {
     "build": "rollup -c",
@@ -46,21 +46,21 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.21.5",
-    "@babel/preset-env": "^7.21.5",
-    "@babel/register": "^7.21.0",
-    "@hebcal/learning": "^1.1.2",
+    "@babel/core": "^7.22.11",
+    "@babel/preset-env": "^7.22.10",
+    "@babel/register": "^7.22.5",
+    "@hebcal/learning": "^1.5.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-commonjs": "^24.1.0",
+    "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.2",
-    "@rollup/plugin-terser": "^0.4.1",
-    "ava": "^5.2.0",
-    "core-js": "^3.30.1",
-    "eslint": "^8.39.0",
+    "@rollup/plugin-node-resolve": "^15.2.1",
+    "@rollup/plugin-terser": "^0.4.3",
+    "ava": "^5.3.1",
+    "core-js": "^3.32.1",
+    "eslint": "^8.48.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^4.0.2",
     "jsdoc-to-markdown": "^8.0.0",
-    "rollup": "^3.21.0"
+    "rollup": "^3.28.1"
   }
 }