Move Sedra and Hebrew translations back up a level from @hebcal/hdate

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/core",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "contributors": [
     "Eyal Schachter (https://github.com/Scimonster)",
@@ -46,9 +46,10 @@
   ],
   "scripts": {
     "build:rollup": "rollup -c",
-    "build": "npm run version && npm run build:rollup --production",
+    "build": "npm run po2json && npm run version && npm run build:rollup --production",
     "prepublish": "npm run build",
     "version": "node ./version.cjs package.json src/pkgVersion.ts",
+    "po2json": "node ./po2json.cjs po/*.po",
     "readme": "cp dist/index.mjs tmp.js && npx -p jsdoc-to-markdown jsdoc2md tmp.js && rm -f tmp.js",
     "pretest": "npm run build",
     "lint": "eslint src",
@@ -79,10 +80,11 @@
     "jsdoc-to-markdown": "^8.0.1",
     "quick-lru": "^7.0.0",
     "rollup": "^4.18.0",
+    "ttag-cli": "^1.10.12",
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@hebcal/hdate": "^0.9.13",
+    "@hebcal/hdate": "^0.10.1",
     "@hebcal/noaa": "^0.8.14",
     "tslib": "^2.6.2"
   }

po2json.cjs

@@ -0,0 +1,29 @@
+/* eslint-disable require-jsdoc */
+const fs = require('fs');
+const path = require('path');
+const parser = require('ttag-cli/dist/src/lib/parser');
+const utils = require('ttag-cli/dist/src/lib/utils');
+
+for (const arg of process.argv.slice(2)) {
+  const outpath = './src/' + path.basename(arg) + '.ts';
+  console.log(`${arg} => ${outpath}`);
+  writePoFile(arg, outpath, false);
+}
+
+function writePoFile(inpath, outpath, nostrip) {
+  const poData = parser.parse(
+      fs.readFileSync(inpath).toString().normalize(),
+  );
+  const messages = utils.iterateTranslations(poData.translations);
+  if (!nostrip) {
+    const header = messages.next().value;
+    delete header.comments;
+    for (const msg of messages) {
+      delete msg.comments;
+    }
+  }
+  const outstream = fs.createWriteStream(outpath, {flags: 'w'});
+  outstream.write('export default ');
+  outstream.write(JSON.stringify(utils.convert2Compact(poData), null, 0));
+  outstream.end();
+}

src/HebrewDateEvent.ts

@@ -1,5 +1,6 @@
 import {HDate, gematriya, months, Locale} from '@hebcal/hdate';
 import {Event, flags} from './event';
+import '../src/locale'; // Adds Hebrew and Ashkenazic translations
 
 /** Daily Hebrew date ("11th of Sivan, 5780") */
 export class HebrewDateEvent extends Event {

src/HolidayEvent.ts

@@ -2,6 +2,7 @@ import {HDate, Locale, isoDateString} from '@hebcal/hdate';
 import {Event, flags} from './event';
 import {TimedEvent} from './TimedEvent';
 import {holidayDesc as hdesc} from './staticHolidays';
+import '../src/locale'; // Adds Hebrew and Ashkenazic translations
 
 const minorHolidays = [
   hdesc.LAG_BAOMER,

src/MevarchimChodeshEvent.ts

@@ -1,6 +1,7 @@
 import {HDate, Locale, months} from '@hebcal/hdate';
 import {Event, flags} from './event';
 import {Molad} from './molad';
+import '../src/locale'; // Adds Hebrew and Ashkenazic translations
 
 const mevarchimChodeshStr = 'Shabbat Mevarchim Chodesh';
 

src/ParshaEvent.ts

@@ -1,5 +1,6 @@
 import {Event, flags} from './event';
 import {HDate, Locale, isoDateString} from '@hebcal/hdate';
+import '../src/locale'; // Adds Hebrew and Ashkenazic translations
 
 /**
  * Represents one of 54 weekly Torah portions, always on a Saturday

src/TimedEvent.ts

@@ -4,6 +4,7 @@ import { Location } from './location';
 import { Event } from './event';
 import { reformatTimeStr } from './reformatTimeStr';
 import { Zmanim } from './zmanim';
+import '../src/locale'; // Adds Hebrew and Ashkenazic translations
 
 /** An event that has an `eventTime` and `eventTimeStr` */
 export class TimedEvent extends Event {

src/YomKippurKatanEvent.ts

@@ -1,6 +1,7 @@
 import {HDate, Locale} from '@hebcal/hdate';
 import {flags} from './event';
 import {HolidayEvent} from './HolidayEvent';
+import '../src/locale'; // Adds Hebrew and Ashkenazic translations
 
 export const ykk = 'Yom Kippur Katan';
 

src/event.ts

@@ -1,4 +1,5 @@
 import {HDate, Locale} from '@hebcal/hdate';
+import '../src/locale'; // Adds Hebrew and Ashkenazic translations
 
 /**
  * Holiday flags for Event

src/hebcal.ts

@@ -22,10 +22,11 @@
 import {
   getBirthdayHD, getYahrzeitHD, greg, months,
   HDate, Locale,
-  Sedra,
 } from '@hebcal/hdate';
+import '../src/locale'; // Adds Hebrew and Ashkenazic translations
 import {CalOptions} from './CalOptions';
 import {version as pkgVersion} from './pkgVersion';
+import {Sedra} from './sedra';
 import {DailyLearning} from './DailyLearning';
 import {HebrewDateEvent} from './HebrewDateEvent';
 import {ParshaEvent} from './ParshaEvent';

src/index.ts

@@ -1,5 +1,6 @@
 export {gematriya, gematriyaStrToNum} from '@hebcal/hdate';
 export {greg, months, HDate, Locale} from '@hebcal/hdate';
+import './locale'; // Adds Hebrew and Ashkenazic translations
 export {CalOptions} from './CalOptions';
 export {HebrewDateEvent} from './HebrewDateEvent';
 export {Event, flags} from './event';
@@ -9,7 +10,7 @@ export {Zmanim} from './zmanim';
 export {TimedEvent, CandleLightingEvent, HavdalahEvent} from './TimedEvent';
 export {Molad, MoladEvent} from './molad';
 export {OmerEvent} from './omer';
-export {Sedra, parshiot} from '@hebcal/hdate';
+export {Sedra, parshiot} from './sedra';
 export {ParshaEvent} from './ParshaEvent';
 export {HolidayEvent, AsaraBTevetEvent,
   RoshChodeshEvent, RoshHashanaEvent} from './HolidayEvent';

src/locale.ts

@@ -0,0 +1,20 @@
+import {Locale, LocaleData, StringArrayMap} from '@hebcal/hdate';
+import poAshkenazi from './ashkenazi.po';
+import poHe from './he.po';
+
+Locale.addTranslations('he', poHe);
+Locale.addTranslations('h', poHe);
+Locale.addTranslations('ashkenazi', poAshkenazi);
+Locale.addTranslations('a', poAshkenazi);
+
+/* Hebrew without nikkud */
+const heStrs = poHe.contexts[''];
+const heNoNikud: StringArrayMap = {};
+for (const [key, val] of Object.entries(heStrs)) {
+  heNoNikud[key] = [Locale.hebrewStripNikkud(val[0])];
+}
+const poHeNoNikud: LocaleData = {
+  headers: poHe.headers,
+  contexts: {'': heNoNikud},
+};
+Locale.addTranslations('he-x-NoNikud', poHeNoNikud);

src/molad.ts

@@ -3,6 +3,7 @@ import {Event, flags} from './event';
 import {CalOptions} from './CalOptions';
 import {HDate, Locale, molad, Molad as MoladBase} from '@hebcal/hdate';
 import {reformatTimeStr} from './reformatTimeStr';
+import '../src/locale'; // Adds Hebrew and Ashkenazic translations
 
 const shortDayNames = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
 const heDayNames = ['רִאשׁוֹן', 'שֵׁנִי', 'שְׁלִישִׁי', 'רְבִיעִי', 'חֲמִישִׁי', 'שִׁישִּׁי', 'שַׁבָּת'];

src/omer.ts

@@ -8,6 +8,7 @@ import {
   omerTodayIs
 } from '@hebcal/hdate';
 import {Event, flags} from './event';
+import '../src/locale'; // Adds Hebrew and Ashkenazic translations
 
 /** Represents a day 1-49 of counting the Omer from Pesach to Shavuot */
 export class OmerEvent extends Event {