@hebcal/icalendar 6.3.3 → 6.3.5

package/dist/{index.js → icalendar.js}

@@ -1,4 +1,4 @@
-/*! @hebcal/icalendar v6.3.3 */
+/*! @hebcal/icalendar v6.3.5 */
 import { flags } from '@hebcal/core/dist/esm/event';
 import { Locale } from '@hebcal/core/dist/esm/locale';
 import { murmur32HexSync } from 'murmurhash3';
@@ -8,10 +8,8 @@ import { getHolidayDescription } from '@hebcal/rest-api/dist/esm/holiday';
 import { makeTorahMemoText } from '@hebcal/rest-api/dist/esm/memo';
 import { appendIsraelAndTracking } from '@hebcal/rest-api/dist/esm/url';
 import { makeAnchor } from '@hebcal/rest-api/dist/esm/makeAnchor';
-import { promises } from 'fs';
-
-// DO NOT EDIT THIS AUTO-GENERATED FILE!
-const version = '6.3.3';
+import { promises } from 'node:fs';
+import { version } from './pkgVersion.js';
 
 const vtimezoneCache = new Map();
 const CATEGORY = {
@@ -78,6 +76,7 @@ class IcalEvent {
         const opts = Object.assign({}, options);
         this.options = opts;
         this.dtstamp = opts.dtstamp || IcalEvent.makeDtstamp(new Date());
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const ev0 = ev;
         if (typeof ev0.sequence === 'number') {
             this.sequence = ev0.sequence;
@@ -261,7 +260,7 @@ class IcalEvent {
     static fold(line) {
         let isASCII = true;
         for (let i = 0; i < line.length; i++) {
-            if (line.charCodeAt(i) > 255) {
+            if (line.codePointAt(i) > 255) {
                 isASCII = false;
                 break;
             }
@@ -278,33 +277,33 @@ class IcalEvent {
         }
         // iterate unicode character by character, making sure
         // that adding a new character would keep the line <= 75 octets
+        const segmenter = new Intl.Segmenter('en', { granularity: 'grapheme' });
+        const segments = segmenter.segment(line);
+        const chars = Array.from(segments, s => s.segment);
         let result = '';
         let current = '';
         let len = 0;
-        for (let i = 0; i < line.length; i++) {
-            const char = line[i];
-            const octets = char.charCodeAt(0) < 256 ? 1 : encoder.encode(char).length;
+        for (const ch of chars) {
+            const octets = ch.codePointAt(0) < 256 ? 1 : encoder.encode(ch).length;
             const newlen = len + octets;
             if (newlen < 75) {
-                current += char;
+                current += ch;
                 len = newlen;
             }
             else {
                 result += current + '\r\n ';
-                line = line.substring(i);
-                current = '';
-                len = 0;
-                i = -1;
+                current = ch;
+                len = octets;
             }
         }
         return result + current;
     }
     static escape(str) {
-        if (str.indexOf(',') !== -1) {
-            str = str.replace(/,/g, '\\,');
+        if (str.includes(',')) {
+            str = str.replaceAll(',', String.raw `\,`);
         }
-        if (str.indexOf(';') !== -1) {
-            str = str.replace(/;/g, '\\;');
+        if (str.includes(';')) {
+            str = str.replaceAll(';', String.raw `\;`);
         }
         return str;
     }
@@ -342,10 +341,13 @@ const HOLIDAY_IGNORE_MASK = DAILY_LEARNING |
     flags.MOLAD |
     flags.USER_EVENT |
     flags.HEBREW_DATE;
+const ESC_NEWLINE = String.raw `\n`;
+const DBL_NEWLINE = ESC_NEWLINE + ESC_NEWLINE;
 /**
  * @private
  */
 function makeTorahMemo(ev, il) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     if (ev.getFlags() & HOLIDAY_IGNORE_MASK || ev.eventTime) {
         return '';
     }
@@ -358,7 +360,7 @@ function makeTorahMemo(ev, il) {
     if (typeof memo === 'string') {
         return memo;
     }
-    memo = makeTorahMemoText(ev, il).replace(/\n/g, '\\n');
+    memo = makeTorahMemoText(ev, il).replaceAll('\n', ESC_NEWLINE);
     torahMemoCache.set(key, memo);
     return memo;
 }
@@ -367,8 +369,8 @@ function makeTorahMemo(ev, il) {
  */
 function createMemo(ev, options) {
     let memo = ev.memo || '';
-    if (memo.length && memo.indexOf('\n') !== -1) {
-        memo = memo.replace(/\n/g, '\\n');
+    if (memo.length && memo.includes('\n')) {
+        memo = memo.replaceAll('\n', ESC_NEWLINE);
     }
     const desc = ev.getDesc();
     if (desc === 'Havdalah' || desc === 'Candle lighting') {
@@ -381,33 +383,34 @@ function createMemo(ev, options) {
             omerEv.sefira('en'),
             omerEv.sefira('he'),
             omerEv.sefira('translit'),
-        ].join('\\n');
+        ].join(ESC_NEWLINE);
         return (omerEv.getTodayIs('en') +
-            '\\n\\n' +
+            DBL_NEWLINE +
             omerEv.getTodayIs('he') +
-            '\\n\\n' +
+            DBL_NEWLINE +
             sefira);
     }
     if (!memo) {
         memo = getHolidayDescription(ev);
     }
     if (!memo) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const linkEv = ev.linkedEvent;
-        if (typeof linkEv !== 'undefined' && linkEv.getDesc() !== ev.getDesc()) {
+        if (linkEv && linkEv.getDesc() !== ev.getDesc()) {
             memo = linkEv.render(options.locale);
         }
     }
     const torahMemo = makeTorahMemo(ev, options.il);
     if (torahMemo) {
         if (memo.length) {
-            memo += '\\n\\n';
+            memo += DBL_NEWLINE;
         }
         memo += torahMemo;
     }
     const url = appendTrackingToUrl(ev.url(), options);
     if (url) {
         if (memo.length) {
-            memo += '\\n\\n';
+            memo += DBL_NEWLINE;
         }
         memo += url;
     }
@@ -438,20 +441,29 @@ const localeMap = {
     ashkenazi: 'en',
     ashkenazi_romanian: 'ro',
 };
-/**
- * Generates an RFC 2445 iCalendar string from an array of IcalEvents
- */
-async function icalEventsToString(icals, options) {
-    if (!icals.length)
-        throw new RangeError('Events can not be empty');
-    if (!options)
-        throw new TypeError('Invalid options object');
-    const stream = [];
-    const locale = options.locale || 'en';
+async function getVtimezone(tzid) {
+    const vtz = vtimezoneCache.get(tzid);
+    if (typeof vtz === 'string') {
+        return vtz;
+    }
+    const filename = `./zoneinfo/${tzid}.ics`;
+    try {
+        const contents = await promises.readFile(filename, 'utf-8');
+        const lines = contents.split('\r\n');
+        // ignore first 3 and last 1 lines
+        const str = lines.slice(3, lines.length - 2).join('\r\n');
+        vtimezoneCache.set(tzid, str);
+        return str;
+    }
+    catch (_a) {
+        // ignore failure when no timezone definition to read
+        return undefined;
+    }
+}
+function makeIcalPreamble(opts) {
+    const locale = opts.locale || 'en';
     const lang = locale.length === 2 ? locale : localeMap[locale] || 'en';
     const uclang = lang.toUpperCase();
-    const opts = Object.assign({}, options);
-    opts.dtstamp = opts.dtstamp || IcalEvent.makeDtstamp(new Date());
     const title = opts.title ? IcalEvent.escape(opts.title) : 'Untitled';
     const caldesc = opts.caldesc
         ? IcalEvent.escape(opts.caldesc)
@@ -470,46 +482,42 @@ async function icalEventsToString(icals, options) {
     ];
     if (opts.publishedTTL !== false) {
         const publishedTTL = opts.publishedTTL || 'P7D';
-        preamble.push(`REFRESH-INTERVAL;VALUE=DURATION:${publishedTTL}`);
-        preamble.push(`X-PUBLISHED-TTL:${publishedTTL}`);
+        preamble.push(`REFRESH-INTERVAL;VALUE=DURATION:${publishedTTL}`, `X-PUBLISHED-TTL:${publishedTTL}`);
     }
-    preamble.push(`X-WR-CALNAME:${title}`);
-    preamble.push(`X-WR-CALDESC:${caldesc}`);
+    preamble.push(`X-WR-CALNAME:${title}`, `X-WR-CALDESC:${caldesc}`);
+    const relcalid = opts.relcalid;
+    if (relcalid) {
+        preamble.push(`X-WR-RELCALID:${relcalid}`);
+    }
+    const calendarColor = opts.calendarColor;
+    if (calendarColor) {
+        preamble.push(`X-APPLE-CALENDAR-COLOR:${calendarColor}`);
+    }
+    return preamble;
+}
+/**
+ * Generates an RFC 2445 iCalendar string from an array of IcalEvents
+ */
+async function icalEventsToString(icals, options) {
+    if (!icals.length)
+        throw new RangeError('Events can not be empty');
+    if (!options)
+        throw new TypeError('Invalid options object');
+    const stream = [];
+    const preamble = makeIcalPreamble(options);
     for (const line of preamble.map(IcalEvent.fold)) {
         stream.push(line);
         stream.push('\r\n');
     }
-    if (opts.relcalid) {
-        stream.push(IcalEvent.fold(`X-WR-RELCALID:${opts.relcalid}`));
-        stream.push('\r\n');
-    }
-    if (opts.calendarColor) {
-        stream.push(`X-APPLE-CALENDAR-COLOR:${opts.calendarColor}\r\n`);
-    }
-    const location = opts.location;
+    const location = options.location;
     const tzid = location === null || location === void 0 ? void 0 : location.getTzid();
     if (tzid) {
         stream.push(`X-WR-TIMEZONE;VALUE=TEXT:${tzid}\r\n`);
-        const vtz = vtimezoneCache.get(tzid);
+        const vtz = await getVtimezone(tzid);
         if (typeof vtz === 'string') {
             stream.push(vtz);
             stream.push('\r\n');
         }
-        else {
-            const vtimezoneFilename = `./zoneinfo/${tzid}.ics`;
-            try {
-                const vtimezoneIcs = await promises.readFile(vtimezoneFilename, 'utf-8');
-                const lines = vtimezoneIcs.split('\r\n');
-                // ignore first 3 and last 1 lines
-                const str = lines.slice(3, lines.length - 2).join('\r\n');
-                stream.push(str);
-                stream.push('\r\n');
-                vtimezoneCache.set(tzid, str);
-            }
-            catch (error) {
-                // ignore failure when no timezone definition to read
-            }
-        }
     }
     for (const ical of icals) {
         const lines = ical.getLines();

package/dist/pkgVersion.d.ts

@@ -1 +1 @@
-export declare const version = "6.3.3";
+export declare const version = "6.3.5";

package/dist/pkgVersion.js

@@ -0,0 +1,5 @@
+/*! @hebcal/icalendar v6.3.5 */
+// DO NOT EDIT THIS AUTO-GENERATED FILE!
+const version = '6.3.5';
+
+export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/icalendar",
-  "version": "6.3.3",
+  "version": "6.3.5",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "ical",
@@ -10,13 +10,13 @@
   ],
   "description": "Jewish holidays and Hebrew calendar as iCalendar RFC 2445",
   "type": "module",
-  "module": "./dist/index.js",
+  "module": "./dist/icalendar.js",
   "typings": "./dist/icalendar.d.ts",
   "exports": {
-    ".": "./dist/index.js"
+    ".": "./dist/icalendar.js"
   },
   "engines": {
-    "node": ">= 18.0.0"
+    "node": ">= 20"
   },
   "files": [
     "dist"
@@ -30,7 +30,7 @@
   },
   "homepage": "https://hebcal.github.io/api/icalendar/",
   "dependencies": {
-    "@hebcal/core": "^6.0.6",
+    "@hebcal/core": "^6.0.8",
     "@hebcal/hdate": "^0.21.1",
     "@hebcal/rest-api": "^6.4.0",
     "murmurhash3": "^0.5.0",
@@ -40,7 +40,6 @@
     "build:rollup": "rollup -c",
     "build:version": "node ./version.cjs package.json src/pkgVersion.ts",
     "build": "npm run build:version && npm run build:rollup",
-    "prepare": "npm run build",
     "pretest": "npm run build",
     "docs": "typedoc",
     "test": "vitest",
@@ -51,13 +50,13 @@
   },
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@hebcal/learning": "^6.6.0",
+    "@hebcal/learning": "^6.6.1",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@types/node": "24.9.2",
-    "gts": "^5.3.1",
-    "rollup": "^4.53.3",
-    "typedoc": "^0.28.15",
+    "@types/node": "25.0.10",
+    "gts": "^7.0.0",
+    "rollup": "^4.56.0",
+    "typedoc": "^0.28.16",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.15"
+    "vitest": "^4.0.18"
   }
 }