@bobfrankston/gcal 0.1.8 → 0.1.10

package/gcal.ts

@@ -90,7 +90,8 @@ async function listEvents(
     accessToken: string,
     calendarId = 'primary',
     maxResults = 10,
-    timeMin?: string
+    timeMin?: string,
+    timeMax?: string
 ): Promise<GoogleEvent[]> {
     const params = new URLSearchParams({
         maxResults: maxResults.toString(),
@@ -98,6 +99,9 @@ async function listEvents(
         orderBy: 'startTime',
         timeMin: timeMin || new Date().toISOString()
     });
+    if (timeMax) {
+        params.set('timeMax', timeMax);
+    }
 
     const url = `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events?${params}`;
     const res = await apiFetch(url, accessToken);
@@ -239,14 +243,19 @@ Options:
   -defaultUser <email>     Set default user for future use
   -c, -calendar <id>       Calendar ID (default: primary)
   -n <count>               Number of events to list
-  -v, -verbose             Show event IDs and links
+  -after <when>            List events after this date/time
+  -before <when>           List events before this date/time
+  -verbose                 Show event IDs and links
+  -v, --version            Show version
 
 Examples:
   gcal meeting.ics                        Import ICS file
   gcal list                               List next 10 events
+  gcal list -after tomorrow -before "jan 30"
   gcal add "Dentist" "Friday 3pm" "1h"
   gcal add "Lunch" "1/14/2026 12:00" "1h"
-  gcal add "Meeting" "tomorrow 10:00"
+  gcal add "Meeting" "tomorrow 10am"
+  gcal add "Call" "3pm" "30m"
   gcal add "Appointment" "jan 15 2pm"
   gcal -defaultUser bob@gmail.com         Set default user
 
@@ -265,7 +274,10 @@ interface ParsedArgs {
     count: number;
     help: boolean;
     verbose: boolean;
+    version: boolean;
     icsFile: string;  /** Direct .ics file path */
+    after: string;    /** Filter: events after this date/time */
+    before: string;   /** Filter: events before this date/time */
 }
 
 function parseArgs(argv: string[]): ParsedArgs {
@@ -278,7 +290,10 @@ function parseArgs(argv: string[]): ParsedArgs {
         count: 10,
         help: false,
         verbose: false,
-        icsFile: ''
+        version: false,
+        icsFile: '',
+        after: '',
+        before: ''
     };
 
     const unknown: string[] = [];
@@ -303,11 +318,23 @@ function parseArgs(argv: string[]): ParsedArgs {
             case '-n':
                 result.count = parseInt(argv[++i]) || 10;
                 break;
-            case '-v':
+            case '-after':
+            case '--after':
+                result.after = argv[++i] || '';
+                break;
+            case '-before':
+            case '--before':
+                result.before = argv[++i] || '';
+                break;
             case '-verbose':
             case '--verbose':
                 result.verbose = true;
                 break;
+            case '-v':
+            case '-V':
+            case '--version':
+                result.version = true;
+                break;
             case '-h':
             case '-help':
             case '--help':
@@ -378,6 +405,12 @@ async function main(): Promise<void> {
         }
     }
 
+    if (parsed.version) {
+        const pkg = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, 'package.json'), 'utf-8'));
+        console.log(`gcal ${pkg.version}`);
+        process.exit(0);
+    }
+
     if (parsed.help) {
         showUsage();
         process.exit(0);
@@ -428,7 +461,9 @@ async function main(): Promise<void> {
         case 'list': {
             const count = parsed.args[0] ? parseInt(parsed.args[0]) : parsed.count;
             const token = await getAccessToken(user, false);
-            const events = await listEvents(token, parsed.calendar, count);
+            const timeMin = parsed.after ? parseDateTime(parsed.after).toISOString() : undefined;
+            const timeMax = parsed.before ? parseDateTime(parsed.before).toISOString() : undefined;
+            const events = await listEvents(token, parsed.calendar, count, timeMin, timeMax);
 
             if (events.length === 0) {
                 console.log('No upcoming events found.');
@@ -484,6 +519,32 @@ async function main(): Promise<void> {
             const durationMins = parseDuration(duration);
             const endTime = new Date(startTime.getTime() + durationMins * 60 * 1000);
 
+            // Check for suspicious dates (likely parsing errors)
+            const now = new Date();
+            const twoYearsFromNow = new Date(now);
+            twoYearsFromNow.setFullYear(twoYearsFromNow.getFullYear() + 2);
+
+            let warning = '';
+            if (startTime < now) {
+                warning = `Date is in the past: ${formatDateTime({ dateTime: startTime.toISOString() })}`;
+            } else if (startTime > twoYearsFromNow) {
+                warning = `Date is more than 2 years away: ${formatDateTime({ dateTime: startTime.toISOString() })}`;
+            }
+
+            if (warning) {
+                console.log(`\nWarning: ${warning}`);
+                console.log(`Input was: "${when}"`);
+                const readline = await import('readline');
+                const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+                const response = await new Promise<string>(resolve => {
+                    rl.question('Continue? (y/N) ', answer => { rl.close(); resolve(answer); });
+                });
+                if (response.toLowerCase() !== 'y') {
+                    console.log('Cancelled.');
+                    process.exit(0);
+                }
+            }
+
             const event: GoogleEvent = {
                 summary: title,
                 start: {

package/glib/gutils.ts

@@ -307,6 +307,29 @@ export function parseDateTime(input: string): Date {
         return d;
     }
 
+    // Handle time with am/pm: "10am", "3pm", "10:30am", "3:45pm" - assume today
+    const timeAmPmMatch = lower.match(/^(\d{1,2})(?::(\d{2}))?\s*(am|pm)$/);
+    if (timeAmPmMatch) {
+        const [, hour, min, ampm] = timeAmPmMatch;
+        const d = new Date(now);
+        let h = parseInt(hour);
+        if (ampm === 'pm' && h < 12) h += 12;
+        if (ampm === 'am' && h === 12) h = 0;
+        d.setHours(h, parseInt(min || '0'), 0, 0);
+        return d;
+    }
+
+    // Handle bare hour: "10", "14" - interpret as today at that hour (not a month)
+    const bareHourMatch = input.match(/^(\d{1,2})$/);
+    if (bareHourMatch) {
+        const hour = parseInt(bareHourMatch[1]);
+        if (hour >= 0 && hour <= 23) {
+            const d = new Date(now);
+            d.setHours(hour, 0, 0, 0);
+            return d;
+        }
+    }
+
     // Try native Date parsing
     const parsed = new Date(input);
     if (!isNaN(parsed.getTime())) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/gcal",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Google Calendar CLI tool with ICS import support",
   "type": "module",
   "main": "gcal.ts",