@pipedream/google_calendar 0.3.16 → 0.3.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/google_calendar",
-  "version": "0.3.16",
+  "version": "0.3.17",
   "description": "Pipedream Google_calendar Components",
   "main": "google_calendar.app.mjs",
   "keywords": [

package/sources/common/common.mjs

@@ -2,25 +2,14 @@ import googleCalendar from "../../google_calendar.app.mjs";
 import { DEFAULT_POLLING_SOURCE_TIMER_INTERVAL } from "@pipedream/platform";
 
 export default {
-  props: ({ useCalendarId }) => {
-    const props = {
-      googleCalendar,
-      timer: {
-        type: "$.interface.timer",
-        default: {
-          intervalSeconds: DEFAULT_POLLING_SOURCE_TIMER_INTERVAL,
-        },
+  props: {
+    googleCalendar,
+    timer: {
+      type: "$.interface.timer",
+      default: {
+        intervalSeconds: DEFAULT_POLLING_SOURCE_TIMER_INTERVAL,
       },
-    };
-    if (useCalendarId) {
-      props.calendarId = {
-        propDefinition: [
-          googleCalendar,
-          "calendarId",
-        ],
-      };
-    }
-    return props;
+    },
   },
   hooks: {
     async activate() {

package/sources/event-cancelled/event-cancelled.mjs

@@ -5,13 +5,17 @@ export default {
   key: "google_calendar-event-cancelled",
   name: "New Cancelled Event",
   description: "Emit new event when a Google Calendar event is cancelled or deleted",
-  version: "0.1.4",
+  version: "0.1.5",
   type: "source",
   dedupe: "unique",
   props: {
-    ...common.props({
-      useCalendarId: true,
-    }),
+    ...common.props,
+    calendarId: {
+      propDefinition: [
+        common.props.googleCalendar,
+        "calendarId",
+      ],
+    },
   },
   methods: {
     ...common.methods,

package/sources/event-ended/event-ended.mjs

@@ -5,13 +5,17 @@ export default {
   key: "google_calendar-event-ended",
   name: "New Ended Event",
   description: "Emit new event when a Google Calendar event ends",
-  version: "0.1.4",
+  version: "0.1.5",
   type: "source",
   dedupe: "unique",
   props: {
-    ...common.props({
-      useCalendarId: true,
-    }),
+    ...common.props,
+    calendarId: {
+      propDefinition: [
+        common.props.googleCalendar,
+        "calendarId",
+      ],
+    },
   },
   methods: {
     ...common.methods,

package/sources/event-start/event-start.mjs

@@ -6,23 +6,41 @@ export default {
   key: "google_calendar-event-start",
   name: "New Event Start",
   description: "Emit new event when the specified time before the Google Calendar event starts",
-  version: "0.1.5",
+  version: "0.1.6",
   type: "source",
   dedupe: "unique",
   props: {
-    ...common.props({
-      useCalendarId: true,
-    }),
+    ...common.props,
+    calendarId: {
+      propDefinition: [
+        common.props.googleCalendar,
+        "calendarId",
+      ],
+    },
+    minutesBefore: {
+      type: "integer",
+      label: "Minutes Before",
+      description: "Emit the event this many minutes before the event starts",
+      default: 5,
+    },
   },
   methods: {
     ...common.methods,
+    getMillisecondsBefore() {
+      return +this.minutesBefore * 60 * 1000;
+    },
     getConfig({
-      intervalMs, now,
+      now, intervalMs,
     }) {
-      const timeMin = now.toISOString();
+      const {
+        getMillisecondsBefore,
+        calendarId,
+      } = this;
+
+      const timeMin = new Date(now.getTime() - getMillisecondsBefore()).toISOString();
       const timeMax = new Date(now.getTime() + intervalMs).toISOString();
       return {
-        calendarId: this.calendarId,
+        calendarId,
         timeMax,
         timeMin,
         singleEvents: true,
@@ -30,12 +48,12 @@ export default {
       };
     },
     isRelevant(event, {
-      intervalMs, now,
+      now, intervalMs,
     }) {
-      const eventStart = event?.start?.dateTime;
-      const start = new Date(eventStart);
+      const start = new Date(event?.start?.dateTime);
       const msFromStart = start.getTime() - now.getTime();
-      return eventStart && msFromStart > 0 && msFromStart < intervalMs;
+      return msFromStart > 0
+        && msFromStart < (this.getMillisecondsBefore() + intervalMs);
     },
   },
   sampleEmit,

package/sources/new-calendar/new-calendar.mjs

@@ -4,12 +4,10 @@ export default {
   key: "google_calendar-new-calendar",
   name: "New Calendar Created",
   description: "Emit new event when a calendar is created.",
-  version: "0.1.4",
+  version: "0.1.5",
   type: "source",
   props: {
-    ...common.props({
-      useCalendarId: false,
-    }),
+    ...common.props,
     db: "$.service.db",
   },
   hooks: {

package/sources/new-event/new-event.mjs

@@ -5,13 +5,17 @@ export default {
   key: "google_calendar-new-event",
   name: "New Event Created",
   description: "Emit new event when a Google Calendar event is created",
-  version: "0.1.4",
+  version: "0.1.5",
   type: "source",
   dedupe: "unique",
   props: {
-    ...common.props({
-      useCalendarId: true,
-    }),
+    ...common.props,
+    calendarId: {
+      propDefinition: [
+        common.props.googleCalendar,
+        "calendarId",
+      ],
+    },
   },
   methods: {
     ...common.methods,

package/sources/new-event-search/new-event-search.mjs

@@ -5,16 +5,20 @@ export default {
   key: "google_calendar-new-event-search",
   name: "New Event Matching a Search",
   description: "Emit new event when a Google Calendar event is created that matches a search",
-  version: "0.1.4",
+  version: "0.1.5",
   type: "source",
   dedupe: "unique",
   props: {
-    ...common.props({
-      useCalendarId: true,
-    }),
+    ...common.props,
+    calendarId: {
+      propDefinition: [
+        common.props.googleCalendar,
+        "calendarId",
+      ],
+    },
     q: {
       propDefinition: [
-        common.props({}).googleCalendar,
+        common.props.googleCalendar,
         "q",
       ],
     },

package/sources/new-or-updated-event/new-or-updated-event.mjs

@@ -5,13 +5,17 @@ export default {
   key: "google_calendar-new-or-updated-event",
   name: "New Created or Updated Event",
   description: "Emit new event when a Google Calendar events is created or updated (does not emit cancelled events)",
-  version: "0.1.4",
+  version: "0.1.5",
   type: "source",
   dedupe: "unique",
   props: {
-    ...common.props({
-      useCalendarId: true,
-    }),
+    ...common.props,
+    calendarId: {
+      propDefinition: [
+        common.props.googleCalendar,
+        "calendarId",
+      ],
+    },
   },
   methods: {
     ...common.methods,