@bobfrankston/gcal 0.1.10 → 0.1.12

package/gcal.ts

@@ -96,12 +96,11 @@ async function listEvents(
     const params = new URLSearchParams({
         maxResults: maxResults.toString(),
         singleEvents: 'true',
-        orderBy: 'startTime',
-        timeMin: timeMin || new Date().toISOString()
+        orderBy: 'startTime'
     });
-    if (timeMax) {
-        params.set('timeMax', timeMax);
-    }
+    if (timeMin) params.set('timeMin', timeMin);
+    if (timeMax) params.set('timeMax', timeMax);
+    if (!timeMin && !timeMax) params.set('timeMin', new Date().toISOString());
 
     const url = `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events?${params}`;
     const res = await apiFetch(url, accessToken);
@@ -232,6 +231,7 @@ Usage:
 
 Commands:
   list [n]                           List upcoming n events (default: 10)
+  past [n]                           List past n events (default: 10)
   add <title> <when> [duration]      Add event
   del|delete <id> [id2...]           Delete event(s) by ID (prefix match)
   import <file.ics>                  Import events from ICS file
@@ -243,19 +243,14 @@ Options:
   -defaultUser <email>     Set default user for future use
   -c, -calendar <id>       Calendar ID (default: primary)
   -n <count>               Number of events to list
-  -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
+  -v, -verbose             Show event IDs and links
 
 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 10am"
-  gcal add "Call" "3pm" "30m"
+  gcal add "Meeting" "tomorrow 10:00"
   gcal add "Appointment" "jan 15 2pm"
   gcal -defaultUser bob@gmail.com         Set default user
 
@@ -274,10 +269,7 @@ 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 {
@@ -290,10 +282,7 @@ function parseArgs(argv: string[]): ParsedArgs {
         count: 10,
         help: false,
         verbose: false,
-        version: false,
-        icsFile: '',
-        after: '',
-        before: ''
+        icsFile: ''
     };
 
     const unknown: string[] = [];
@@ -318,23 +307,11 @@ function parseArgs(argv: string[]): ParsedArgs {
             case '-n':
                 result.count = parseInt(argv[++i]) || 10;
                 break;
-            case '-after':
-            case '--after':
-                result.after = argv[++i] || '';
-                break;
-            case '-before':
-            case '--before':
-                result.before = argv[++i] || '';
-                break;
+            case '-v':
             case '-verbose':
             case '--verbose':
                 result.verbose = true;
                 break;
-            case '-v':
-            case '-V':
-            case '--version':
-                result.version = true;
-                break;
             case '-h':
             case '-help':
             case '--help':
@@ -405,12 +382,6 @@ 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);
@@ -461,9 +432,7 @@ 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 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);
+            const events = await listEvents(token, parsed.calendar, count);
 
             if (events.length === 0) {
                 console.log('No upcoming events found.');
@@ -507,6 +476,57 @@ async function main(): Promise<void> {
             break;
         }
 
+        case 'past': {
+            const count = parsed.args[0] ? parseInt(parsed.args[0]) : parsed.count;
+            const token = await getAccessToken(user, false);
+            // Get events before now, then reverse to show most recent first
+            const now = new Date();
+            const thirtyDaysAgo = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000);
+            const events = await listEvents(token, parsed.calendar, count, thirtyDaysAgo.toISOString(), now.toISOString());
+            events.reverse();  // Most recent first
+
+            if (events.length === 0) {
+                console.log('No past events found in last 30 days.');
+            } else {
+                console.log(`\nPast events (${events.length}):\n`);
+
+                // Build table data (same format as list)
+                const rows: string[][] = [];
+                for (const event of events) {
+                    const shortId = (event.id || '').slice(0, 8);
+                    const start = event.start ? formatDateTime(event.start) : '?';
+                    const duration = (event.start && event.end) ? formatDuration(event.start, event.end) : '';
+                    const summary = event.summary || '(no title)';
+                    const loc = event.location || '';
+                    if (parsed.verbose) {
+                        rows.push([shortId, start, duration, summary, loc, event.htmlLink || '']);
+                    } else {
+                        rows.push([shortId, start, duration, summary, loc]);
+                    }
+                }
+
+                // Calculate column widths
+                const headers = parsed.verbose
+                    ? ['ID', 'When', 'Dur', 'Event', 'Location', 'Link']
+                    : ['ID', 'When', 'Dur', 'Event', 'Location'];
+                const colWidths = headers.map((h, i) =>
+                    Math.max(h.length, ...rows.map(r => (r[i] || '').length))
+                );
+
+                // Print header
+                const headerLine = headers.map((h, i) => h.padEnd(colWidths[i])).join('  ');
+                console.log(headerLine);
+                console.log(colWidths.map(w => '-'.repeat(w)).join('  '));
+
+                // Print rows
+                for (const row of rows) {
+                    const line = row.map((cell, i) => (cell || '').padEnd(colWidths[i])).join('  ');
+                    console.log(line);
+                }
+            }
+            break;
+        }
+
         case 'add': {
             if (parsed.args.length < 2) {
                 console.error('Usage: gcal add <title> <when> [duration]');
@@ -519,32 +539,6 @@ 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

@@ -298,36 +298,31 @@ export function parseDateTime(input: string): Date {
         }
     }
 
-    // Handle time only (HH:mm) - assume today
+    // Handle time only (HH:mm) - assume today, or tomorrow if time already passed
     const timeMatch = input.match(/^(\d{1,2}):(\d{2})$/);
     if (timeMatch) {
         const [, hour, min] = timeMatch;
         const d = new Date(now);
         d.setHours(parseInt(hour), parseInt(min), 0, 0);
+        if (d <= now) {
+            d.setDate(d.getDate() + 1);  // Time passed, use tomorrow
+        }
         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);
+    // Handle time with am/pm (2pm, 10am, 2:30pm) - assume today, or tomorrow if time already passed
+    const ampmMatch = lower.match(/^(\d{1,2})(?::(\d{2}))?\s*(am|pm)$/);
+    if (ampmMatch) {
+        const [, hour, min, ampm] = ampmMatch;
         let h = parseInt(hour);
         if (ampm === 'pm' && h < 12) h += 12;
         if (ampm === 'am' && h === 12) h = 0;
+        const d = new Date(now);
         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;
+        if (d <= now) {
+            d.setDate(d.getDate() + 1);  // Time passed, use tomorrow
         }
+        return d;
     }
 
     // Try native Date parsing

package/package.json

@@ -1,46 +1,50 @@
-{
-  "name": "@bobfrankston/gcal",
-  "version": "0.1.10",
-  "description": "Google Calendar CLI tool with ICS import support",
-  "type": "module",
-  "main": "gcal.ts",
-  "bin": {
-    "gcal": "gcal.ts"
-  },
-  "files": [
-    "gcal.ts",
-    "glib/**/*.ts",
-    "tsconfig.json",
-    "README.md"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/BobFrankston/gcal.git"
-  },
-  "scripts": {
-    "check": "tsc --noEmit",
-    "prerelease:local": "git add -A && (git diff-index --quiet HEAD || git commit -m \"Pre-release commit\")",
-    "preversion": "npm run check && git add -A",
-    "postversion": "git push && git push --tags",
-    "release": "npm run prerelease:local && npm version patch && npm publish --access public",
-    "release:local": "npm run prerelease:local && npm version patch && npm publish --access public --ignore-scripts",
-    "installer": "npm run release && npm install -g ."
-  },
-  "keywords": [
-    "google",
-    "calendar",
-    "ics",
-    "ical",
-    "oauth",
-    "cli"
-  ],
-  "author": "Bob Frankston",
-  "license": "MIT",
-  "devDependencies": {
-    "@types/node": "^25.0.3"
-  },
-  "dependencies": {
-    "@bobfrankston/oauthsupport": "^1.0.1",
-    "ical.js": "^2.1.0"
-  }
-}
+{
+  "name": "@bobfrankston/gcal",
+  "version": "0.1.12",
+  "description": "Google Calendar CLI tool with ICS import support",
+  "type": "module",
+  "main": "gcal.ts",
+  "bin": {
+    "gcal": "gcal.ts"
+  },
+  "files": [
+    "gcal.ts",
+    "glib/**/*.ts",
+    "tsconfig.json",
+    "README.md"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/BobFrankston/gcal.git"
+  },
+  "scripts": {
+    "check": "tsc --noEmit",
+    "prerelease:local": "git add -A && (git diff-index --quiet HEAD || git commit -m \"Pre-release commit\")",
+    "preversion": "npm run check && git add -A",
+    "postversion": "git push && git push --tags",
+    "release": "npm run prerelease:local && npm version patch && npm publish --access public",
+    "release:local": "npm run prerelease:local && npm version patch && npm publish --access public --ignore-scripts",
+    "installer": "npm run release && npm install -g ."
+  },
+  "keywords": [
+    "google",
+    "calendar",
+    "ics",
+    "ical",
+    "oauth",
+    "cli"
+  ],
+  "author": "Bob Frankston",
+  "license": "MIT",
+  "devDependencies": {
+    "@types/node": "^25.0.9"
+  },
+  "dependencies": {
+    "@bobfrankston/oauthsupport": "^1.0.5",
+    "ical.js": "^2.1.0"
+  },
+  ".dependencies": {
+    "@bobfrankston/oauthsupport": "file:../../../projects/OAuth/OauthSupport",
+    "ical.js": "^2.1.0"
+  }
+}