Add Recurrence Rule

lindskogen · Sep 7, 2022 · 7e223b8 · 7e223b8
1 parent 289ccd5
commit 7e223b8
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 9 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,6  6,7 @@
     "DTSTAMP",
     "DTSTART",
     "PRODID",
     "rrule",
     "VCALENDAR",
     "VEVENT"
   ]

diff --git a/date.ts b/date.ts
@@ -1,4  1,6 @@
-export default function parseDate(date: DateData) {
 export function parseDate(date: DateData | undefined) {
   if (date === undefined) return;
 
   if (date instanceof Date) {
     date = [
       date.getFullYear(),

diff --git a/main.ts b/main.ts
@@ -1,7  1,7 @@
 import { crypto } from 'https://deno.land/[email protected]/crypto/mod.ts';
-import parseDate from './date.ts';
-import { DateData } from './date.ts';
 import { parseDate, DateData } from './date.ts';
 import { ContentLine, stringifyLines } from './stringify.ts';
 import { parseRRule, RecurrenceRule } from './rrule.ts';
 
 const calendarBegin: ContentLine = ['BEGIN', 'VCALENDAR'];
 
@@ -39,7  39,7 @@ export class Event {
 
   toLines(): ContentLine[] {
     const uid = crypto.randomUUID();
-    const { title, description } = this.config;
     const { title, desc, rrule } = this.config;
 
     return [
       eventBegin,
@@ -48,7  48,8 @@ export class Event {
       ['DTSTART', parseDate(this.config.beginDate)],
       ['DTEND', parseDate(this.config.endDate!)],
       ['SUMMARY', title],
-      ['DESCRIPTION', description],
       ['DESCRIPTION', desc],
       ['RRULE', parseRRule(rrule)],
       eventEnd,
     ].filter(line => line[1] !== undefined) as ContentLine[];
   }
@@ -73,5  74,6 @@ export interface EventConfig {
   beginDate: DateData;
   endDate?: DateData;
   duration?: number;
-  description?: string;
   desc?: string;
   rrule?: RecurrenceRule;
 }
diff --git a/rrule.ts b/rrule.ts
@@ -0,0  1,24 @@
 import { parseDate, DateData } from './date.ts';
 
 export interface RecurrenceRule {
   freq: 'DAILY' | 'WEEKLY' | 'MONTHLY' | 'YEARLY';
   until?: DateData;
   interval?: number;
   count?: number;
 }
 
 export function parseRRule(rrule: RecurrenceRule | undefined) {
   if (rrule === undefined) return;
 
   const { freq, until, interval, count } = rrule;
 
   return [
     ['FREQ', freq],
     ['UNTIL', parseDate(until)],
     ['INTERVAL', interval],
     ['COUNT', count],
   ]
     .filter(line => line[1] !== undefined)
     .map(line => `${line[0]}=${line[1]};`)
     .join('');
 }
diff --git a/tests.ts b/tests.ts
@@ -7,7  7,7 @@ Deno.test({
       title: 'test',
       beginDate: [2022, 8, 1, 10, 10],
       endDate: [2022, 8, 1, 11, 10],
-      description: 'Hello',
       desc: 'Hello',
     };
     const evt = new Event(cfg);
 
@@ -37,13  37,17 @@ Deno.test({
       title: 'Write Typescript',
       beginDate: [2022, 9, 6, 9, 30],
       endDate: [2022, 9, 6, 10],
-      description: 'Implement a module to generate .ics files',
       desc: 'Implement a module to generate .ics files',
     };
 
     const cfg2: EventConfig = {
-      title: 'Write Rust',
       title: 'Write Rust for next 3 days',
       beginDate: new Date(),
       duration: 3600, // Duration: 3600s, or 1h
       rrule: {
         freq: 'DAILY',
         count: 3,
       },
     };
 
     const evt1 = new Event(cfg1);