ical-generator 7.0.1-develop.2 → 7.1.0-develop.2

package/package.json

@@ -25,7 +25,7 @@
     "esm": "^3.2.25",
     "license-checker": "^25.0.1",
     "luxon": "^3.4.4",
-    "mocha": "^10.3.0",
+    "mocha": "^10.4.0",
     "mochawesome": "^7.1.3",
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.45",
@@ -37,7 +37,7 @@
     "ts-node": "^10.9.2",
     "tsup": "^8.0.2",
     "typedoc": "^0.25.12",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.3"
   },
   "engines": {
     "node": ">=18.0.0"
@@ -125,5 +125,5 @@
     "test": "mocha"
   },
   "type": "module",
-  "version": "7.0.1-develop.2"
+  "version": "7.1.0-develop.2"
 }

package/src/event.ts

@@ -1666,9 +1666,9 @@ export default class ICalEvent {
         this.swapStartAndEndIfRequired();
         g += 'DTSTAMP:' + formatDate(this.calendar.timezone(), this.data.stamp) + '\r\n';
         if (this.data.allDay) {
-            g += 'DTSTART;VALUE=DATE:' + formatDate(this.calendar.timezone(), this.data.start, true) + '\r\n';
+            g += 'DTSTART;VALUE=DATE:' + formatDate(this.timezone(), this.data.start, true) + '\r\n';
             if (this.data.end) {
-                g += 'DTEND;VALUE=DATE:' + formatDate(this.calendar.timezone(), this.data.end, true) + '\r\n';
+                g += 'DTEND;VALUE=DATE:' + formatDate(this.timezone(), this.data.end, true) + '\r\n';
             }
 
             g += 'X-MICROSOFT-CDO-ALLDAYEVENT:TRUE\r\n';

package/src/tools.ts

@@ -54,13 +54,19 @@ export function formatDate (timezone: string | null, d: ICalDateTimeValue, dateo
     }
     else if(isMoment(d)) {
         // @see https://momentjs.com/timezone/docs/#/using-timezones/parsing-in-zone/
-        const m = timezone ? (isMomentTZ(d) && !d.tz() ? d.clone().tz(timezone) : d) : (floating ? d : d.utc());
+        const m = timezone
+            ? (isMomentTZ(d) && !d.tz() ? d.clone().tz(timezone) : d)
+            : (floating || (dateonly && isMomentTZ(d) && d.tz()) ? d : d.utc());
+
         return m.format('YYYYMMDD') + (!dateonly ? (
             'T' + m.format('HHmmss') + (floating || timezone ? '' : 'Z')
         ) : '');
     }
     else if(isLuxonDate(d)) {
-        const m = timezone ? d.setZone(timezone) : (floating ? d : d.setZone('utc'));
+        const m = timezone
+            ? d.setZone(timezone)
+            : (floating || (dateonly && d.zone.type !== 'system') ? d : d.setZone('utc'));
+
         return m.toFormat('yyyyLLdd') + (!dateonly ? (
             'T' + m.toFormat('HHmmss') + (floating || timezone ? '' : 'Z')
         ) : '');

package/src/types.ts

@@ -76,6 +76,7 @@ export interface ICalMomentDurationStub {
 
 export interface ICalLuxonDateTimeStub {
     setZone(zone?: string): ICalLuxonDateTimeStub;
+    zone: { type: string; };
     toFormat(fmt: string): string;
     toJSDate(): Date;
     get isValid(): boolean;