Return event variables for window api (#26)

* WIP

* WIP

* update readme

* Update event type to CalenderEvent

* 1.4.0

Author: mdroidian

README.md

@@ -70,13 +70,45 @@ The function accepts a single object parameter with the following optional prope
 
 **Returns**
 
-A Promise that resolves to an array of `InputTextNode[]`. Each InputTextNode represents an event fetched from Google Calendar, formatted according to the user's settings. The structure of an InputTextNode is as follows:
+A Promise that resolves to an array of `ExtendedInputTextNode[]`. Each ExtendedInputTextNode represents an event fetched from Google Calendar, formatted according to the user's settings.
 
 ```typescript
-interface InputTextNode {
+type ExtendedInputTextNode = {
   text: string;
   children?: InputTextNode[];
-}
+  event?: CalenderEvent;
+};
+
+type InputTextNode = {
+  text: string;
+  children?: InputTextNode[];
+  uid?: string;
+  heading?: number;
+  textAlign?: TextAlignment;
+  viewType?: ViewType;
+  open?: boolean;
+  props?: Record<string, unknown>;
+};
+
+type CalenderEvent = {
+  id: string;
+  transparency: "transparent" | "opaque";
+  summary: string;
+  description?: string;
+  htmlLink: string;
+  hangoutLink: string;
+  location: string;
+  attendees?: {
+    displayName?: string;
+    email: string;
+    self: boolean;
+    responseStatus: "declined" | "accepted";
+  }[];
+  start: { dateTime: string };
+  end: { dateTime: string };
+  visibility?: "private" | "public";
+  calendar: string;
+};
 ```
 
 **Example**

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "google",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Connect to various Google services to your Roam graph!",
   "main": "./build/main.js",
   "scripts": {

package.json

@@ -25,7 +25,7 @@ import updateBlock from "roamjs-components/writes/updateBlock";
 import addYears from "date-fns/addYears";
 import apiPut from "roamjs-components/util/apiPut";
 import apiPost from "roamjs-components/util/apiPost";
-import type { Event } from "../utils/event";
+import type { CalenderEvent } from "../utils/event";
 
 type Props = {
   calendar?: {
@@ -180,7 +180,10 @@ const CreateEventDialog = ({
                           calendarId
                         )}/events${edit ? `/${edit}` : ""}`,
                       };
-                      (edit ? apiPut<Event>(args) : apiPost<Event>(args))
+                      (edit
+                        ? apiPut<CalenderEvent>(args)
+                        : apiPost<CalenderEvent>(args)
+                      )
                         .then((r) => {
                           if (!edit) {
                             if (blockUid)

src/components/CreateEventDialog.tsx

@@ -29,7 +29,7 @@ import addMinutes from "date-fns/addMinutes";
 import getAccessToken from "../utils/getAccessToken";
 import CreateEventDialog from "../components/CreateEventDialog";
 import renderOverlay from "roamjs-components/util/renderOverlay";
-import { blockFormatEvent, Event } from "../utils/event";
+import { blockFormatEvent, CalenderEvent } from "../utils/event";
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
 import getUidsFromButton from "roamjs-components/dom/getUidsFromButton";
 import parseNlpDate from "roamjs-components/date/parseNlpDate";
@@ -38,6 +38,10 @@ import getSubTree from "roamjs-components/util/getSubTree";
 import createPage from "roamjs-components/writes/createPage";
 import extractRef from "roamjs-components/util/extractRef";
 
+type ExtendedInputTextNode = InputTextNode & {
+  event?: CalenderEvent;
+};
+
 const GOOGLE_COMMAND = "Import Google Calendar";
 export const DEFAULT_FORMAT = `{summary} ({start:hh:mm a} - {end:hh:mm a}){confLink}`;
 
@@ -185,7 +189,7 @@ const loadGoogleCalendar = (args: OnloadArgs) => {
               .then((Authorization) =>
                 Authorization
                   ? apiGet<{
-                      items: Event[];
+                      items: CalenderEvent[];
                     }>({
                       authorization: `Bearer ${Authorization}`,
                       domain: "https://www.googleapis.com",
@@ -198,15 +202,15 @@ const loadGoogleCalendar = (args: OnloadArgs) => {
                       error: "",
                     }))
                   : Promise.resolve({
-                      items: [] as Event[],
+                      items: [] as CalenderEvent[],
                       calendar,
                       error: `${UNAUTHORIZED_MESSAGE}${
                         account ? ` for account ${account}` : ""
                       }`,
                     })
               )
               .catch((e) => ({
-                items: [] as Event[],
+                items: [] as CalenderEvent[],
                 calendar,
                 error: `Error for calendar ${calendar}: ${
                   e?.error?.code === "404"
@@ -249,18 +253,24 @@ const loadGoogleCalendar = (args: OnloadArgs) => {
             if (events.length === 0 && errors.length === 0) {
               return [{ text: EMPTY_MESSAGE }];
             }
-            return [
-              ...events
-                .filter((e) => !skipFree || e.transparency !== "transparent")
-                .filter(
-                  (e) =>
-                    !(e.attendees || []).some(
-                      (a) => a.self && a.responseStatus === "declined"
-                    )
-                )
-                .map((e) => blockFormatEvent(e, format)),
-              ...errors.map((e) => ({ text: e })),
-            ];
+            const filteredEvents = events
+              .filter((e) => !skipFree || e.transparency !== "transparent")
+              .filter(
+                (e) =>
+                  !(e.attendees || []).some(
+                    (a) => a.self && a.responseStatus === "declined"
+                  )
+              );
+            const eventInputTextNodes: ExtendedInputTextNode[] =
+              filteredEvents.map((e) => {
+                const inputTextNode = blockFormatEvent(e, format);
+                return {
+                  ...inputTextNode,
+                  event: e,
+                };
+              });
+            const errorNodes = errors.map((e) => ({ text: e }));
+            return [...eventInputTextNodes, ...errorNodes];
           });
       };
 
@@ -393,7 +403,7 @@ const loadGoogleCalendar = (args: OnloadArgs) => {
                 const text = getTextByBlockUid(blockUid);
                 const eventId = GCAL_EVENT_REGEX.exec(text)?.[1] || "";
                 const edit = window.atob(eventId).split(" ")[0];
-                return apiGet<{ data: Event }>({
+                return apiGet<{ data: CalenderEvent }>({
                   domain: `https://www.googleapis.com`,
                   path: `calendar/v3/calendars/${encodeURIComponent(
                     c.calendar
@@ -454,7 +464,7 @@ const loadGoogleCalendar = (args: OnloadArgs) => {
                   const text = getTextByBlockUid(blockUid);
                   const eventId = GCAL_EVENT_REGEX.exec(text)?.[1] || "";
                   const edit = window.atob(eventId).split(" ")[0];
-                  return apiGet<{ data: Event }>({
+                  return apiGet<{ data: CalenderEvent }>({
                     domain: `https://www.googleapis.com`,
                     path: `calendar/v3/calendars/${encodeURIComponent(
                       c.calendar

src/services/calendar.ts

@@ -4,7 +4,7 @@ import type { InputTextNode } from "roamjs-components/types/native";
 
 const DEFAULT_DATE_FORMAT = "hh:mm a";
 
-export type Event = {
+export type CalenderEvent = {
   id: string;
   transparency: "transparent" | "opaque";
   summary: string;
@@ -32,19 +32,19 @@ const resolveDate = (d: { dateTime?: string; format?: string }) => {
   return format(date, d?.format || DEFAULT_DATE_FORMAT);
 };
 
-const resolveAttendees = (e: Event, s: string) => {
+const resolveAttendees = (e: CalenderEvent, s: string) => {
   return (e.attendees || [])
     .map((attn) =>
       (s || "NAME").replace(/NAME/g, attn["displayName"] || attn["email"])
     )
     .join(", ");
 };
 
-const resolveSummary = (e: Event) =>
+const resolveSummary = (e: CalenderEvent) =>
   e.visibility === "private" ? "busy" : e.summary || "No Summary";
 
 export const blockFormatEvent = (
-  e: Event,
+  e: CalenderEvent,
   format: InputTextNode
 ): InputTextNode => {
   const summary = resolveSummary(e);