Rework implementation of fix for holidays with dashes in name for sed…

…ra find
hebcal · Nov 3, 2024 · 000374c · 000374c
1 parent 95f5e89
commit 000374c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/src/sedra.ts b/src/sedra.ts
@@ -161,24 +161,19 @@ export class Sedra {
       if (parsha >= parshiot.length || (parsha < 0 && !isValidDouble(parsha))) {
         throw new RangeError(`Invalid parsha number: ${parsha}`);
       }
-      const idx = this.theSedraArray.indexOf(parsha);
-      if (idx === -1) {
-        return null; // doesn't occur this year
-      }
-      return new HDate(this.firstSaturday + idx * 7);
+      return this.findInternal(parsha);
     } else if (typeof parsha === 'string') {
       const num = parsha2id.get(parsha);
       if (typeof num === 'number') {
         return this.find(num);
       } else if (parsha.indexOf('-') !== -1) {
+        if (parsha === CHMPESACH || parsha === CHMSUKOT) {
+          return this.findInternal(parsha);
+        }
         return this.find(parsha.split('-'));
       } else {
         // try to find Saturday holiday like 'Yom Kippur'
-        const idx = this.theSedraArray.indexOf(parsha);
-        if (idx === -1) {
-          return null; // doesn't occur this year
-        }
-        return new HDate(this.firstSaturday + idx * 7);
+        return this.findInternal(parsha);
       }
     } else if (Array.isArray(parsha)) {
       const plen = parsha.length;
@@ -194,16 +189,6 @@ export class Sedra {
       const p2 = parsha[1];
       const num1 = parsha2id.get(p1);
       const num2 = parsha2id.get(p2);
-      //Attempt to find Holidays with dash such as Sukkot Shabbat Chol ha-Moed
-      if (
-        !num1 &&
-        !num2 &&
-        this.theSedraArray.indexOf(parsha.join('-')) !== -1
-      ) {
-        const rejoinedName = parsha.join('-');
-        const idx = this.theSedraArray.indexOf(rejoinedName);
-        return new HDate(this.firstSaturday + idx * 7);
-      }
       if (
         typeof num1 !== 'number' ||
         typeof num2 !== 'number' ||
@@ -217,6 +202,14 @@ export class Sedra {
     return null; /* NOTREACHED */
   }
 
+  private findInternal(parsha: NumberOrString): HDate | null {
+    const idx = this.theSedraArray.indexOf(parsha);
+    if (idx === -1) {
+      return null; // doesn't occur this year
+    }
+    return new HDate(this.firstSaturday + idx * 7);
+  }
+
   /**
    * Returns the date that a parsha (or its doubled or undoubled counterpart)
    * occurs, or `null` if the parsha doesn't occur this year

diff --git a/test/sedra.spec.ts b/test/sedra.spec.ts
@@ -132,6 +132,7 @@ test('find', () => {
   expect(sedra.find('Chukat-Balak')).toBe(null);
   const sedra5785 = new Sedra(5785, false);
   expect(dt(sedra5785.find('Sukkot Shabbat Chol ha-Moed'))).toBe('2024-10-19');
+  expect(sedra.find('Sukkot Shabbat Chol ha-Moed')).toBeNull();
 });
 
 test('findContaining', () => {