@ncukondo/gcal-cli 0.2.1 → 0.2.3

package/dist/index.js

@@ -6,25 +6,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
@@ -587718,7 +587736,7 @@ function errorCodeToExitCode(code) {
 // package.json
 var package_default = {
   name: "@ncukondo/gcal-cli",
-  version: "0.2.1",
+  version: "0.2.3",
   type: "module",
   exports: {
     ".": "./dist/index.js"
@@ -587989,7 +588007,8 @@ async function getAuthenticatedClient(fs, fetchFn = globalThis.fetch) {
 }
 var OAUTH_SCOPES = [
   "https://www.googleapis.com/auth/calendar.readonly",
-  "https://www.googleapis.com/auth/calendar.events"
+  "https://www.googleapis.com/auth/calendar.events",
+  "email"
 ];
 async function startOAuthFlow(credentials, fs, fetchFn = globalThis.fetch) {
   return new Promise((resolve) => {
@@ -588145,15 +588164,20 @@ async function handleAuthStatus(opts) {
   }
   const email2 = await fetchUserEmail(currentTokens.access_token, fetchFn);
   const expiresAt = new Date(currentTokens.expiry_date);
+  const reAuthHint = "Run `gcal auth --logout` then `gcal auth` to re-authenticate with updated permissions.";
   if (format === "json") {
     write(formatJsonSuccess({
       authenticated: true,
       email: email2,
-      expires_at: expiresAt.toISOString()
+      expires_at: expiresAt.toISOString(),
+      ...email2 == null ? { hint: reAuthHint } : {}
     }));
   } else {
     write(`Authenticated as: ${email2 ?? "unknown"}`);
     write(`Token expires: ${expiresAt.toISOString()}`);
+    if (email2 == null) {
+      write(reAuthHint);
+    }
   }
   return { exitCode: ExitCode.SUCCESS };
 }
@@ -588400,7 +588424,6 @@ function applyFilters(events, options) {
   const afterTransparency = filterByTransparency(events, options.transparency);
   return filterByStatus(afterTransparency, options);
 }
-
 // node_modules/date-fns/locale/en-US/_lib/formatDistance.mjs
 var formatDistanceLocale = {
   lessThanXSeconds: {
@@ -590573,7 +590596,7 @@ function parseDateTimeInZone(dateStr, timezone) {
 // src/commands/search.ts
 var DEFAULT_SEARCH_DAYS = 30;
 async function handleSearch(opts) {
-  const { api: api2, query, format: format3, calendars, timezone, write } = opts;
+  const { api: api2, query, format: format4, calendars, timezone, write } = opts;
   const writeErr = opts.writeErr ?? (() => {});
   const now = new Date;
   const days = opts.days ?? DEFAULT_SEARCH_DAYS;
@@ -590619,7 +590642,7 @@ async function handleSearch(opts) {
   if (opts.includeTentative !== undefined)
     filterOpts.includeTentative = opts.includeTentative;
   const filtered = applyFilters(allEvents, filterOpts);
-  if (format3 === "json") {
+  if (format4 === "json") {
     write(formatJsonSuccess({
       query,
       events: filtered,
@@ -590650,10 +590673,10 @@ function createSearchCommand() {
 
 // src/commands/show.ts
 async function handleShow(opts) {
-  const { api: api2, eventId, calendarId, calendarName, format: format3, timezone, write } = opts;
+  const { api: api2, eventId, calendarId, calendarName, format: format4, timezone, write } = opts;
   try {
     const event = await getEvent(api2, calendarId, calendarName, eventId, timezone);
-    if (format3 === "json") {
+    if (format4 === "json") {
       write(formatJsonSuccess({ event }));
     } else {
       write(formatEventDetailText(event));
@@ -590661,7 +590684,7 @@ async function handleShow(opts) {
     return { exitCode: ExitCode.SUCCESS };
   } catch (error) {
     if (error instanceof ApiError) {
-      if (format3 === "json") {
+      if (format4 === "json") {
         write(formatJsonError(error.code, error.message));
       } else {
         write(`Error: ${error.message}`);
@@ -591727,19 +591750,19 @@ function resolveDateRange(input, timezone, now = () => new Date) {
   }
   if (input.from) {
     const fromDate = parseDateTimeInZone(input.from, timezone);
-    const toDate3 = input.to ? addDays(parseDateTimeInZone(input.to, timezone), 1) : addDays(fromDate, 7);
+    const toDate4 = input.to ? addDays(parseDateTimeInZone(input.to, timezone), 1) : addDays(fromDate, 7);
     return {
       timeMin: formatDateTimeInZone(fromDate, timezone),
-      timeMax: formatDateTimeInZone(toDate3, timezone)
+      timeMax: formatDateTimeInZone(toDate4, timezone)
     };
   }
   if (input.to) {
     const todayStr2 = todayInZone(now(), timezone);
     const fromDate = parseDateTimeInZone(todayStr2, timezone);
-    const toDate3 = addDays(parseDateTimeInZone(input.to, timezone), 1);
+    const toDate4 = addDays(parseDateTimeInZone(input.to, timezone), 1);
     return {
       timeMin: formatDateTimeInZone(fromDate, timezone),
-      timeMax: formatDateTimeInZone(toDate3, timezone),
+      timeMax: formatDateTimeInZone(toDate4, timezone),
       warning: "--from not specified, defaulting to today"
     };
   }
@@ -591852,7 +591875,7 @@ function createListCommand() {
 
 // src/commands/update.ts
 async function handleUpdate(opts) {
-  const { api: api2, eventId, calendarId, calendarName, format: format3, timezone, write } = opts;
+  const { api: api2, eventId, calendarId, calendarName, format: format4, timezone, write } = opts;
   const hasUpdate = opts.title !== undefined || opts.start !== undefined || opts.end !== undefined || opts.description !== undefined || opts.busy !== undefined || opts.free !== undefined;
   if (!hasUpdate) {
     throw new ApiError("INVALID_ARGS", "at least one update option must be provided");
@@ -591896,7 +591919,7 @@ async function handleUpdate(opts) {
       changes.start = withTime.start;
     if (withTime.end !== undefined)
       changes.end = withTime.end;
-    if (format3 === "json") {
+    if (format4 === "json") {
       write(formatJsonSuccess({
         dry_run: true,
         action: "update",
@@ -591921,7 +591944,7 @@ async function handleUpdate(opts) {
     return { exitCode: ExitCode.SUCCESS };
   }
   const updated = await updateEvent(api2, calendarId, calendarName, eventId, input);
-  if (format3 === "json") {
+  if (format4 === "json") {
     write(formatJsonSuccess({ event: updated }));
   } else {
     write(formatEventDetailText(updated));
@@ -591945,6 +591968,38 @@ function createUpdateCommand() {
   return cmd;
 }
 
+// src/lib/date-utils.ts
+var DATE_ONLY_RE2 = /^\d{4}-\d{2}-\d{2}$/;
+function isDateOnly(input) {
+  if (!DATE_ONLY_RE2.test(input))
+    return false;
+  const [y, m, d] = input.split("-").map(Number);
+  const date3 = new Date(Date.UTC(y, m - 1, d));
+  return date3.getUTCFullYear() === y && date3.getUTCMonth() === m - 1 && date3.getUTCDate() === d;
+}
+function addDaysToDateString(dateStr, days) {
+  const [y, m, d] = dateStr.split("-").map(Number);
+  const date3 = new Date(Date.UTC(y, m - 1, d + days));
+  return date3.toISOString().slice(0, 10);
+}
+
+// src/lib/duration.ts
+var DURATION_RE = /^(?:(\d+)d)?(?:(\d+)h)?(?:(\d+)m)?$/;
+function parseDuration(input) {
+  const match2 = DURATION_RE.exec(input);
+  if (!match2 || input === "") {
+    throw new Error(`Invalid duration: "${input}". Use formats like 30m, 1h, 2d, 1h30m.`);
+  }
+  const days = Number(match2[1] || 0);
+  const hours = Number(match2[2] || 0);
+  const minutes = Number(match2[3] || 0);
+  const ms = ((days * 24 + hours) * 60 + minutes) * 60 * 1000;
+  if (ms === 0) {
+    throw new Error("Duration must be greater than zero.");
+  }
+  return ms;
+}
+
 // src/commands/add.ts
 async function handleAdd(options, deps) {
   if (!options.title) {
@@ -591955,10 +592010,18 @@ async function handleAdd(options, deps) {
     deps.write(formatJsonError("INVALID_ARGS", "--start is required"));
     return { exitCode: ExitCode.ARGUMENT };
   }
-  if (!options.end) {
-    deps.write(formatJsonError("INVALID_ARGS", "--end is required"));
+  if (options.end && options.duration) {
+    deps.write(formatJsonError("INVALID_ARGS", "--end and --duration cannot be used together"));
     return { exitCode: ExitCode.ARGUMENT };
   }
+  const allDay = isDateOnly(options.start);
+  if (options.end) {
+    const endIsDateOnly = isDateOnly(options.end);
+    if (allDay !== endIsDateOnly) {
+      deps.write(formatJsonError("INVALID_ARGS", "--start and --end must be the same type (both date-only or both datetime)"));
+      return { exitCode: ExitCode.ARGUMENT };
+    }
+  }
   const config2 = deps.loadConfig();
   const timezone = resolveTimezone(options.timezone, config2.timezone);
   const calendars = selectCalendars(options.calendar ? [options.calendar] : undefined, config2);
@@ -591970,20 +592033,54 @@ async function handleAdd(options, deps) {
     transparency = "transparent";
   let start;
   let end;
-  if (options.allDay) {
-    start = options.start.slice(0, 10);
-    end = options.end.slice(0, 10);
+  if (allDay) {
+    start = options.start;
+    if (options.end) {
+      end = addDaysToDateString(options.end, 1);
+    } else if (options.duration) {
+      let durationMs;
+      try {
+        durationMs = parseDuration(options.duration);
+      } catch {
+        deps.write(formatJsonError("INVALID_ARGS", `Invalid duration: "${options.duration}". Use formats like 30m, 1h, 2d, 1h30m.`));
+        return { exitCode: ExitCode.ARGUMENT };
+      }
+      const MS_PER_DAY = 24 * 60 * 60 * 1000;
+      if (durationMs % MS_PER_DAY !== 0) {
+        deps.write(formatJsonError("INVALID_ARGS", "All-day events require day-unit duration (e.g. 1d, 2d). Sub-day durations like hours or minutes are not allowed."));
+        return { exitCode: ExitCode.ARGUMENT };
+      }
+      const days = durationMs / MS_PER_DAY;
+      end = addDaysToDateString(options.start, days);
+    } else {
+      end = addDaysToDateString(options.start, 1);
+    }
   } else {
     const startDate = parseDateTimeInZone(options.start, timezone);
-    const endDate = parseDateTimeInZone(options.end, timezone);
     start = formatDateTimeInZone(startDate, timezone);
-    end = formatDateTimeInZone(endDate, timezone);
+    if (options.end) {
+      const endDate = parseDateTimeInZone(options.end, timezone);
+      end = formatDateTimeInZone(endDate, timezone);
+    } else if (options.duration) {
+      let durationMs;
+      try {
+        durationMs = parseDuration(options.duration);
+      } catch {
+        deps.write(formatJsonError("INVALID_ARGS", `Invalid duration: "${options.duration}". Use formats like 30m, 1h, 2d, 1h30m.`));
+        return { exitCode: ExitCode.ARGUMENT };
+      }
+      const endDate = new Date(startDate.getTime() + durationMs);
+      end = formatDateTimeInZone(endDate, timezone);
+    } else {
+      const endDate = new Date(startDate.getTime() + 60 * 60 * 1000);
+      end = formatDateTimeInZone(endDate, timezone);
+    }
   }
   const input = {
     title: options.title,
     start,
     end,
-    allDay: options.allDay ?? false,
+    allDay,
     timeZone: timezone,
     transparency
   };
@@ -592003,29 +592100,43 @@ ${detail}`);
 }
 function createAddCommand() {
   const cmd = new Command("add").description("Create a new event");
-  cmd.option("-t, --title <title>", "Event title");
-  cmd.option("-s, --start <datetime>", "Start datetime (ISO 8601)");
-  cmd.option("-e, --end <datetime>", "End datetime (ISO 8601)");
-  cmd.option("--all-day", "Create all-day event (use date only)");
+  cmd.requiredOption("-t, --title <title>", "Event title");
+  cmd.requiredOption("-s, --start <datetime>", "Start date or datetime. Date-only (YYYY-MM-DD) creates all-day event. Datetime (YYYY-MM-DDTHH:MM) creates timed event.");
+  cmd.option("-e, --end <datetime>", "End date or datetime. Optional. Default: same day (all-day) or +1h (timed). All-day end is inclusive.");
+  cmd.option("--duration <duration>", "Duration instead of --end (e.g. 30m, 1h, 2d, 1h30m). Mutually exclusive with --end.");
   cmd.option("-d, --description <text>", "Event description");
   cmd.option("--busy", "Mark as busy (default)");
   cmd.option("--free", "Mark as free (transparent)");
+  const endOpt = cmd.options.find((o) => o.long === "--end");
+  const durationOpt = cmd.options.find((o) => o.long === "--duration");
+  endOpt.conflicts(["duration"]);
+  durationOpt.conflicts(["end"]);
   const busyOpt = cmd.options.find((o) => o.long === "--busy");
   const freeOpt = cmd.options.find((o) => o.long === "--free");
   busyOpt.conflicts(["free"]);
   freeOpt.conflicts(["busy"]);
+  cmd.addHelpText("after", `
+Examples:
+  gcal add -t "Holiday" -s "2026-01-24"                                   # All-day, 1 day
+  gcal add -t "Vacation" -s "2026-01-24" -e "2026-01-26"                  # All-day, 3 days (inclusive)
+  gcal add -t "Camp" -s "2026-01-24" --duration 2d                        # All-day, 2 days
+  gcal add -t "Meeting" -s "2026-01-24T10:00"                             # Timed, 1h default
+  gcal add -t "Meeting" -s "2026-01-24T10:00" -e "2026-01-24T11:30"      # Timed, explicit end
+  gcal add -t "Standup" -s "2026-01-24T10:00" --duration 30m             # Timed, 30 min
+  gcal add -t "Focus" -s "2026-01-24T09:00" --duration 2h --free         # Timed, free
+`);
   return cmd;
 }
 
 // src/commands/delete.ts
 async function handleDelete(opts) {
-  const { api: api2, eventId, calendarId, format: format3, quiet, dryRun = false, write } = opts;
+  const { api: api2, eventId, calendarId, format: format4, quiet, dryRun = false, write } = opts;
   if (!eventId) {
     write(formatJsonError("INVALID_ARGS", "event-id is required"));
     return { exitCode: ExitCode.ARGUMENT };
   }
   if (dryRun) {
-    if (format3 === "json") {
+    if (format4 === "json") {
       write(formatJsonSuccess({
         dry_run: true,
         action: "delete",
@@ -592040,7 +592151,7 @@ async function handleDelete(opts) {
   try {
     await deleteEvent(api2, calendarId, eventId);
     if (!quiet) {
-      if (format3 === "json") {
+      if (format4 === "json") {
         write(formatJsonSuccess({ deleted_id: eventId, message: "Event deleted" }));
       } else {
         write("Event deleted");
@@ -592049,7 +592160,7 @@ async function handleDelete(opts) {
     return { exitCode: ExitCode.SUCCESS };
   } catch (error) {
     if (error instanceof ApiError) {
-      if (format3 === "json") {
+      if (format4 === "json") {
         write(formatJsonError(error.code, error.message));
       } else {
         write(`Error: ${error.message}`);
@@ -592075,13 +592186,13 @@ function mergeCalendarsWithConfig(apiCalendars, configCalendars) {
   });
 }
 async function handleCalendars(opts) {
-  const { api: api2, format: format3, quiet, write, configCalendars } = opts;
+  const { api: api2, format: format4, quiet, write, configCalendars } = opts;
   let apiCalendars;
   try {
     apiCalendars = await listCalendars(api2);
   } catch (error) {
     if (error instanceof ApiError) {
-      if (format3 === "json") {
+      if (format4 === "json") {
         write(formatJsonError(error.code, error.message));
       } else {
         write(error.message);
@@ -592096,7 +592207,7 @@ async function handleCalendars(opts) {
 `));
     return { exitCode: ExitCode.SUCCESS };
   }
-  if (format3 === "json") {
+  if (format4 === "json") {
     write(formatJsonSuccess({ calendars }));
   } else {
     write(formatCalendarListText(calendars));
@@ -592113,12 +592224,12 @@ function resolveTimezone2(cliTimezone) {
   return cliTimezone ?? Intl.DateTimeFormat().resolvedOptions().timeZone;
 }
 async function handleInit(opts) {
-  const { fs, format: format3, quiet, write, force, all, local, requestAuth } = opts;
+  const { fs, format: format4, quiet, write, force, all, local, requestAuth } = opts;
   const configPath = local ? `${process.cwd()}/gcal-cli.toml` : getDefaultConfigPath();
   if (!force && fs.existsSync(configPath)) {
     const msg = `Config file already exists: ${configPath}
 Use --force to overwrite.`;
-    if (format3 === "json") {
+    if (format4 === "json") {
       write(formatJsonError("CONFIG_ERROR", msg));
     } else {
       write(msg);
@@ -592134,7 +592245,7 @@ Use --force to overwrite.`;
       calendars = await opts.listCalendars();
     } else if (isAuthRequiredError(error)) {
       const msg = "Not authenticated. Run `gcal auth` to authenticate.";
-      if (format3 === "json") {
+      if (format4 === "json") {
         write(formatJsonError("AUTH_REQUIRED", msg));
       } else {
         write(msg);
@@ -592146,7 +592257,7 @@ Use --force to overwrite.`;
   }
   if (calendars.length === 0) {
     const msg = "No calendars found in Google Calendar.";
-    if (format3 === "json") {
+    if (format4 === "json") {
       write(formatJsonError("API_ERROR", msg));
     } else {
       write(msg);
@@ -592168,7 +592279,7 @@ Use --force to overwrite.`;
     write(configPath);
     return { exitCode: ExitCode.SUCCESS };
   }
-  if (format3 === "json") {
+  if (format4 === "json") {
     write(formatJsonSuccess({
       path: configPath,
       timezone,
@@ -592287,10 +592398,10 @@ function getErrorCode2(error) {
   }
   return "API_ERROR";
 }
-function handleError2(error, format3) {
+function handleError2(error, format4) {
   const errorCode = getErrorCode2(error);
   const message2 = error instanceof Error ? error.message : String(error);
-  if (format3 === "json") {
+  if (format4 === "json") {
     process.stderr.write(formatJsonError(errorCode, message2));
   } else {
     process.stderr.write(`Error: ${message2}
@@ -592545,7 +592656,7 @@ ${url}`);
         title: addOpts.title,
         start: addOpts.start,
         end: addOpts.end,
-        allDay: addOpts.allDay,
+        duration: addOpts.duration,
         description: addOpts.description,
         busy: addOpts.busy,
         free: addOpts.free,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ncukondo/gcal-cli",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "exports": {
     ".": "./dist/index.js"