ical-generator 6.0.2-develop.9 → 7.0.0-develop.2

package/package.json

@@ -125,5 +125,5 @@
     "test": "mocha"
   },
   "type": "module",
-  "version": "6.0.2-develop.9"
+  "version": "7.0.0-develop.2"
 }

package/src/event.ts

@@ -360,16 +360,11 @@ export default class ICalEvent {
     start(start: ICalDateTimeValue): this;
     start(start?: ICalDateTimeValue): this | ICalDateTimeValue {
         if (start === undefined) {
+            this.swapStartAndEndIfRequired();
             return this.data.start;
         }
 
         this.data.start = checkDate(start, 'start');
-        if (this.data.start && this.data.end && toDate(this.data.start).getTime() > toDate(this.data.end).getTime()) {
-            const t = this.data.start;
-            this.data.start = this.data.end;
-            this.data.end = t;
-        }
-
         return this;
     }
 
@@ -391,6 +386,7 @@ export default class ICalEvent {
     end(end: ICalDateTimeValue | null): this;
     end(end?: ICalDateTimeValue | null): this | ICalDateTimeValue | null {
         if (end === undefined) {
+            this.swapStartAndEndIfRequired();
             return this.data.end;
         }
         if (end === null) {
@@ -399,13 +395,19 @@ export default class ICalEvent {
         }
 
         this.data.end = checkDate(end, 'end');
+        return this;
+    }
+
+    /**
+     * Checks if the start date is after the end date and swaps them if necessary.
+     * @private
+     */
+    private swapStartAndEndIfRequired(): void {
         if (this.data.start && this.data.end && toDate(this.data.start).getTime() > toDate(this.data.end).getTime()) {
             const t = this.data.start;
             this.data.start = this.data.end;
             this.data.end = t;
         }
-
-        return this;
     }
 
     /**
@@ -880,7 +882,7 @@ export default class ICalEvent {
 
     /**
      * Set the event's location by passing a string (minimum) or
-     * an {@link ICalLocation} object which will also fill the iCal
+     * an {@link ICalLocationWithTitle} object which will also fill the iCal
      * `GEO` attribute and Apple's `X-APPLE-STRUCTURED-LOCATION`.
      *
      * ```javascript
@@ -904,6 +906,22 @@ export default class ICalEvent {
      * GEO:52.50363;13.32865
      * ```
      *
+     * Since v6.1.0 you can also pass a {@link ICalLocationWithoutTitle} object to pass
+     * the geolocation only. This will only fill the iCal `GEO` attribute.
+     *
+     * ```javascript
+     * event.location({
+     *    geo: {
+     *        lat: 52.503630,
+     *        lon: 13.328650
+     *    }
+     * });
+     * ```
+     *
+     * ```text
+     * GEO:52.50363;13.32865
+     * ```
+     *
      * @since 0.2.0
      */
     location(location: ICalLocation | string | null): this;
@@ -917,10 +935,11 @@ export default class ICalEvent {
             };
             return this;
         }
-        if (
-            (location && !location.title) ||
-            (location?.geo && (!isFinite(location.geo.lat) || !isFinite(location.geo.lon)))
-        ) {
+        if (location && (
+            ('title' in location && !location.title) ||
+            (location?.geo && (!isFinite(location.geo.lat) || !isFinite(location.geo.lon))) ||
+            (!('title' in location) && !location?.geo)
+        )) {
             throw new Error(
                 '`location` isn\'t formatted correctly. See https://sebbo2002.github.io/ical-generator/'+
                 'develop/reference/classes/ICalEvent.html#location'
@@ -1612,6 +1631,7 @@ export default class ICalEvent {
             });
         }
 
+        this.swapStartAndEndIfRequired();
         return Object.assign({}, this.data, {
             start: toJSON(this.data.start) || null,
             end: toJSON(this.data.end) || null,
@@ -1643,6 +1663,7 @@ export default class ICalEvent {
         // SEQUENCE
         g += 'SEQUENCE:' + this.data.sequence + '\r\n';
 
+        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';
@@ -1751,7 +1772,7 @@ export default class ICalEvent {
         }
 
         // LOCATION
-        if (this.data.location?.title) {
+        if (this.data.location && 'title' in this.data.location && this.data.location.title) {
             g += 'LOCATION:' + escape(
                 this.data.location.title +
                 (this.data.location.address ? '\n' + this.data.location.address : ''),
@@ -1766,13 +1787,14 @@ export default class ICalEvent {
                     ':geo:' + escape(this.data.location.geo?.lat, false) + ',' +
                     escape(this.data.location.geo?.lon, false) + '\r\n';
             }
-
-            if (this.data.location.geo) {
-                g += 'GEO:' + escape(this.data.location.geo?.lat, false) + ';' +
-                    escape(this.data.location.geo?.lon, false) + '\r\n';
-            }
         }
 
+        // GEO
+        if (this.data.location && 'geo' in this.data.location && this.data.location.geo) {
+            g += 'GEO:' + escape(this.data.location.geo?.lat, false) + ';' +
+                escape(this.data.location.geo?.lon, false) + '\r\n';
+        }
+        
         // DESCRIPTION
         if (this.data.description) {
             g += 'DESCRIPTION:' + escape(this.data.description.plain, false) + '\r\n';

package/src/index.ts

@@ -99,6 +99,8 @@ export {
     ICalDateTimeValue,
     ICalRepeatingOptions,
     ICalLocation,
+    ICalLocationWithTitle,
+    ICalLocationWithoutTitle,
     ICalGeo,
     ICalOrganizer,
     ICalDescription,

package/src/types.ts

@@ -19,13 +19,19 @@ export interface ICalRepeatingOptions {
     startOfWeek?: ICalWeekday;
 }
 
-export interface ICalLocation {
+export type ICalLocation = ICalLocationWithTitle | ICalLocationWithoutTitle;
+
+export interface ICalLocationWithTitle {
     title: string;
     address?: string;
     radius?: number;
     geo?: ICalGeo;
 }
 
+export interface ICalLocationWithoutTitle {
+    geo: ICalGeo;
+}
+
 export interface ICalGeo {
     lat: number;
     lon: number;