calendaryjs 0.2.4 → 0.3.0

package/dist/index.js

@@ -84,6 +84,14 @@ function getYearsInRange(from, to) {
 function createDate(year, month, day) {
   return new Date(year, month - 1, day);
 }
+function getDaysInMonth(year, month) {
+  return new Date(year, month, 0).getDate();
+}
+function resolveDayOfMonth(day, year, month) {
+  if (day >= 0) return day;
+  const resolved = getDaysInMonth(year, month) + day + 1;
+  return resolved >= 1 ? resolved : null;
+}
 function addDays(date, days) {
   const result = new Date(date);
   result.setDate(result.getDate() + days);
@@ -125,7 +133,7 @@ var constEventHandler = {
   validate(event) {
     if (typeof event !== "object" || event === null) return false;
     const e = event;
-    return e.type === "const" && typeof e.month === "number" && e.month >= 1 && e.month <= 12 && typeof e.day === "number" && e.day >= 1 && e.day <= 31 && typeof e.title === "string" && typeof e.id === "string";
+    return e.type === "const" && typeof e.month === "number" && e.month >= 1 && e.month <= 12 && typeof e.day === "number" && e.day >= -31 && e.day <= 31 && e.day !== 0 && typeof e.title === "string" && typeof e.id === "string";
   },
   generate(event, year) {
     if (event.startYear !== void 0 && year < event.startYear) {
@@ -137,7 +145,9 @@ var constEventHandler = {
     if (event.excludeYears?.includes(year)) {
       return [];
     }
-    return [createDate(year, event.month, event.day)];
+    const day = resolveDayOfMonth(event.day, year, event.month);
+    if (day === null) return [];
+    return [createDate(year, event.month, day)];
   }
 };
 
@@ -157,14 +167,11 @@ var fixedEventHandler = {
 };
 
 // src/generators/monthly.ts
-function getDaysInMonth(year, month) {
-  return new Date(year, month, 0).getDate();
-}
 var monthlyEventHandler = {
   validate(event) {
     if (typeof event !== "object" || event === null) return false;
     const e = event;
-    return e.type === "monthly" && typeof e.day === "number" && e.day >= 1 && e.day <= 31 && typeof e.title === "string" && typeof e.id === "string";
+    return e.type === "monthly" && typeof e.day === "number" && e.day >= -31 && e.day <= 31 && e.day !== 0 && typeof e.title === "string" && typeof e.id === "string";
   },
   generate(event, year) {
     const dates = [];
@@ -182,10 +189,11 @@ var monthlyEventHandler = {
         continue;
       }
       const daysInMonth = getDaysInMonth(year, month);
-      if (event.day > daysInMonth) {
+      const day = resolveDayOfMonth(event.day, year, month);
+      if (day === null || day > daysInMonth) {
         continue;
       }
-      const date = createDate(year, month, event.day);
+      const date = createDate(year, month, day);
       const dateStr = formatDate(date);
       if (event.excludeDates?.includes(dateStr)) {
         continue;
@@ -263,6 +271,49 @@ var weeklyEventHandler = {
   }
 };
 
+// src/generators/daily.ts
+var PHASE_EPOCH = createDate(1970, 1, 1);
+var dailyEventHandler = {
+  validate(event) {
+    if (typeof event !== "object" || event === null) return false;
+    const e = event;
+    if (e.type !== "daily") return false;
+    if (typeof e.title !== "string" || typeof e.id !== "string") return false;
+    if (e.interval !== void 0 && (typeof e.interval !== "number" || e.interval < 1))
+      return false;
+    return true;
+  },
+  generate(event, year) {
+    const interval = event.interval ?? 1;
+    const yearEnd = createDate(year, 12, 31);
+    const startLimit = event.startDate ? parseDate(event.startDate) : null;
+    const endLimit = event.endDate ? parseDate(event.endDate) : null;
+    const anchor = startLimit ?? PHASE_EPOCH;
+    const dates = [];
+    let current = createDate(year, 1, 1);
+    while (current <= yearEnd) {
+      if (startLimit && current < startLimit) {
+        current = addDays(current, 1);
+        continue;
+      }
+      if (endLimit && current > endLimit) break;
+      if (interval > 1) {
+        const offset = daysBetween(anchor, current);
+        if (offset % interval !== 0) {
+          current = addDays(current, 1);
+          continue;
+        }
+      }
+      const dateStr = formatDate(current);
+      if (!event.excludeDates?.includes(dateStr)) {
+        dates.push(new Date(current));
+      }
+      current = addDays(current, 1);
+    }
+    return dates;
+  }
+};
+
 // src/generators/nth-weekday.ts
 function nthWeekdayInMonth(year, month, dayOfWeek, nth) {
   if (nth === -1) {
@@ -305,7 +356,7 @@ var nthWeekdayEventHandler = {
     const hasAnchored = e.after !== void 0;
     if (hasSimple && !hasAnchored) {
       if (typeof e.nth !== "number" || ![1, 2, 3, 4, -1].includes(e.nth)) return false;
-      if (typeof e.month !== "number" || e.month < 1 || e.month > 12)
+      if (e.month !== void 0 && (typeof e.month !== "number" || e.month < 1 || e.month > 12))
         return false;
     } else if (!hasAnchored) {
       return false;
@@ -329,9 +380,17 @@ var nthWeekdayEventHandler = {
       }
       return candidate ? [candidate] : [];
     }
-    if (event.nth !== void 0 && event.month !== void 0) {
-      const date = nthWeekdayInMonth(year, event.month, event.dayOfWeek, event.nth);
-      return date ? [date] : [];
+    if (event.nth !== void 0) {
+      if (event.month !== void 0) {
+        const date = nthWeekdayInMonth(year, event.month, event.dayOfWeek, event.nth);
+        return date ? [date] : [];
+      }
+      const dates = [];
+      for (let month = 1; month <= 12; month++) {
+        const date = nthWeekdayInMonth(year, month, event.dayOfWeek, event.nth);
+        if (date) dates.push(date);
+      }
+      return dates;
     }
     return [];
   }
@@ -648,6 +707,27 @@ var SearchBuilder = class {
     this.options.hasAllCategories = categories;
     return this;
   }
+  /**
+   * Filter by event type(s) — match any (e.g. `"weekly"`, `"daily"`, a plugin type).
+   */
+  type(...types) {
+    this.options.types = types;
+    return this;
+  }
+  /**
+   * Filter by status — match any (e.g. hide cancelled by listing the ones you want).
+   */
+  status(...status) {
+    this.options.status = status;
+    return this;
+  }
+  /**
+   * Filter by source — match any (the plugin / feed / subscription that produced it).
+   */
+  source(...source) {
+    this.options.source = source;
+    return this;
+  }
   /**
    * Search by metadata key-value pairs.
    * Supports nested objects and case-insensitive string matching.
@@ -895,6 +975,15 @@ function executeSearch(events, options) {
       return options.hasAllCategories.every((cat) => e.categories.includes(cat));
     });
   }
+  if (options.types && options.types.length > 0) {
+    results = results.filter((e) => options.types.includes(e.type));
+  }
+  if (options.status && options.status.length > 0) {
+    results = results.filter((e) => e.status !== void 0 && options.status.includes(e.status));
+  }
+  if (options.source && options.source.length > 0) {
+    results = results.filter((e) => e.source !== void 0 && options.source.includes(e.source));
+  }
   if (options.metadata) {
     results = results.filter((e) => matchesMetadata(e.metadata, options.metadata));
   }
@@ -988,6 +1077,7 @@ var CalendaryInstance = class _CalendaryInstance {
     this.eventTypeHandlers.set("fixed", fixedEventHandler);
     this.eventTypeHandlers.set("monthly", monthlyEventHandler);
     this.eventTypeHandlers.set("weekly", weeklyEventHandler);
+    this.eventTypeHandlers.set("daily", dailyEventHandler);
     this.eventTypeHandlers.set("nth-weekday", nthWeekdayEventHandler);
     this.eventTypeHandlers.set(
       "formula",
@@ -1084,6 +1174,27 @@ var CalendaryInstance = class _CalendaryInstance {
       events: c.events
     });
   }
+  /**
+   * Export events as a portable {@link Collection} — the inverse of {@link load}.
+   * Serializes the plain event configs plus a manifest of the plugins their event
+   * types need, so the result round-trips back through `load()`. Pass it to
+   * `JSON.stringify` for a `.cdy` document.
+   *
+   * @param options.group - export a single group; omit to export every group's events.
+   * @param options.name - the collection name (also the default group id on re-load).
+   * @param options.version - an informational version stamp.
+   */
+  toCollection(options = {}) {
+    const groups = options.group !== void 0 ? [this.groups.get(options.group)].filter((g) => g != null) : [...this.groups.values()];
+    const events = groups.flatMap((g) => g.events);
+    const usedTypes = new Set(events.map((e) => e.type));
+    const plugins = [...this.plugins.values()].filter((p) => Object.keys(p.eventTypes ?? {}).some((t) => usedTypes.has(t))).map((p) => p.name);
+    const out = { events };
+    if (options.name) out.collection = options.name;
+    if (options.version) out.version = options.version;
+    if (plugins.length) out.plugins = plugins;
+    return out;
+  }
   removeGroup(groupId) {
     this.groups.delete(groupId);
     this.dirty = true;
@@ -1104,12 +1215,18 @@ var CalendaryInstance = class _CalendaryInstance {
     return this;
   }
   generateEvents(from, to) {
+    if (this.dirty) {
+      this.cache.invalidate();
+      this.dirty = false;
+    }
     const cacheKey = `${from}:${to}`;
-    if (!this.dirty && this.cache.has(cacheKey)) {
+    if (this.cache.has(cacheKey)) {
       return this.cache.get(cacheKey);
     }
     const events = [];
-    const years = getYearsInRange(from, to);
+    const inRange = getYearsInRange(from, to);
+    const years = inRange.length ? [inRange[0] - 1, ...inRange, inRange[inRange.length - 1] + 1] : inRange;
+    const seen = /* @__PURE__ */ new Set();
     for (const group of this.groups.values()) {
       if (!group.enabled) continue;
       for (const eventConfig of group.events) {
@@ -1122,6 +1239,10 @@ var CalendaryInstance = class _CalendaryInstance {
             let dateStr = formatDate(date);
             if (directives.startDate && dateStr < directives.startDate) continue;
             if (directives.endDate && dateStr > directives.endDate) continue;
+            const occYear = +dateStr.slice(0, 4);
+            if (directives.startYear !== void 0 && occYear < directives.startYear) continue;
+            if (directives.endYear !== void 0 && occYear > directives.endYear) continue;
+            if (directives.excludeYears?.includes(occYear)) continue;
             const exception = directives.exceptions?.[dateStr];
             if (exception && "skip" in exception) {
               continue;
@@ -1141,6 +1262,13 @@ var CalendaryInstance = class _CalendaryInstance {
               }
             }
             if (!isDateInRange(dateStr, from, to)) continue;
+            const dedupeKey = JSON.stringify([
+              group.id,
+              eventConfig.id,
+              dateStr
+            ]);
+            if (seen.has(dedupeKey)) continue;
+            seen.add(dedupeKey);
             const calendarEvent = this.createCalendarEvent(
               eventConfig,
               group,
@@ -1159,13 +1287,13 @@ var CalendaryInstance = class _CalendaryInstance {
     });
     this.cache.set(cacheKey, events);
     this.index.index(events);
-    this.dirty = false;
     return events;
   }
   createCalendarEvent(config, group, dateStr, override) {
     const base = config;
     const event = {
       id: generateEventId(base.id, dateStr),
+      type: base.type,
       sourceEventId: base.id,
       title: base.title,
       date: dateStr,
@@ -1221,13 +1349,16 @@ var CalendaryInstance = class _CalendaryInstance {
    * Get calendar days for a date range
    */
   getDays(options) {
-    const { groups } = options;
+    const { groups, types } = options;
     const fromStr = normalizeDateInput(options.from);
     const toStr = normalizeDateInput(options.to);
     let events = this.generateEvents(fromStr, toStr);
     if (groups && groups.length > 0) {
       events = events.filter((e) => groups.includes(e.groupId));
     }
+    if (types && types.length > 0) {
+      events = events.filter((e) => types.includes(e.type));
+    }
     const eventsByDate = /* @__PURE__ */ new Map();
     for (const event of events) {
       const existing = eventsByDate.get(event.date) || [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "calendaryjs",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "description": "Composable calendar & recurrence engine with pluggable calendar systems.",
   "type": "module",
   "sideEffects": false,
@@ -38,7 +38,7 @@
     "typescript"
   ],
   "author": "calendaryjs",
-  "license": "MIT",
+  "license": "PolyForm-Noncommercial-1.0.0",
   "devDependencies": {
     "typescript": "^5.3.2",
     "vitest": "^4.0.18",