@remit/calendar-service 0.0.7 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/calendar-service",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "iCalendar (RFC 5545) parsing, projection and recurrence expansion over the calendar store",
   "type": "module",
   "main": "src/index.ts",

package/src/feed.test.ts

@@ -9,7 +9,6 @@ import {
 	CALENDAR_FEED_TOKEN_BYTES,
 	calendarFeedIsUnchanged,
 	calendarFeedIsUnmodifiedSince,
-	calendarFeedPath,
 	hashCalendarFeedToken,
 	isCalendarFeedToken,
 	mintCalendarFeedToken,
@@ -99,7 +98,7 @@ describe("a feed address", () => {
 		const minted = mintCalendarFeedToken();
 
 		assert.equal(
-			readCalendarFeedToken(calendarFeedPath(minted.token)),
+			readCalendarFeedToken(`/feeds/calendar/${minted.token}.ics`),
 			minted.token,
 		);
 	});
@@ -279,7 +278,9 @@ describe("a feed path in a log line", () => {
 	it("keeps the route and drops the token", () => {
 		const minted = mintCalendarFeedToken();
 
-		const redacted = redactCalendarFeedPath(calendarFeedPath(minted.token));
+		const redacted = redactCalendarFeedPath(
+			`/feeds/calendar/${minted.token}.ics`,
+		);
 
 		assert.equal(redacted.includes(minted.token), false);
 		assert.equal(redacted, "/feeds/calendar/<redacted>.ics");

package/src/feed.ts

@@ -50,9 +50,6 @@ export const mintCalendarFeedToken = (): CalendarFeedSecret => {
 export const isCalendarFeedToken = (token: string): boolean =>
 	TOKEN_SHAPE.test(token);
 
-export const calendarFeedPath = (token: string): string =>
-	`${CALENDAR_FEED_PATH_PREFIX}${token}${CALENDAR_FEED_PATH_SUFFIX}`;
-
 /**
  * The token a request path carries, or `null` when the path is not a feed
  * address. One segment only: a slash inside it would name a different route.

package/src/index.ts

@@ -37,7 +37,6 @@ export {
 	type CalendarFeedSecret,
 	calendarFeedIsUnchanged,
 	calendarFeedIsUnmodifiedSince,
-	calendarFeedPath,
 	hashCalendarFeedToken,
 	isCalendarFeedToken,
 	mintCalendarFeedToken,

package/src/project.ts

@@ -36,18 +36,11 @@ const TRANSPARENCY_BY_ICAL: Record<string, CalendarObjectItem["transparency"]> =
 		TRANSPARENT: CalendarTransparency.Transparent,
 	};
 
-const readString = (component: ICAL.Component, name: string): string => {
+export const readString = (component: ICAL.Component, name: string): string => {
 	const value = component.getFirstPropertyValue(name);
 	return typeof value === "string" ? value : "";
 };
 
-/**
- * Whether the resource expands to more than its master instance — an RRULE, an
- * RDATE, or an override VEVENT. The overrides count: a client that edits one
- * instance of a series and then deletes the rule leaves a resource with nothing
- * but a master and its exceptions, and every one of those is still an
- * occurrence somebody has to see.
- */
 /**
  * The fields that describe one VEVENT rather than the series it belongs to.
  *
@@ -73,6 +66,13 @@ export const projectEventDisplay = (
 		CalendarTransparency.Opaque,
 });
 
+/**
+ * Whether the resource expands to more than its master instance — an RRULE, an
+ * RDATE, or an override VEVENT. The overrides count: a client that edits one
+ * instance of a series and then deletes the rule leaves a resource with nothing
+ * but a master and its exceptions, and every one of those is still an
+ * occurrence somebody has to see.
+ */
 export const hasRecurrence = (calendar: ParsedCalendar): boolean =>
 	calendar.master.hasProperty("rrule") ||
 	calendar.master.hasProperty("rdate") ||

package/src/suggest.ts

@@ -10,7 +10,7 @@ import {
 import type ICAL from "ical.js";
 import type { CalendarResult } from "./errors.js";
 import { parseCalendar } from "./parse.js";
-import { projectCalendar } from "./project.js";
+import { projectCalendar, readString } from "./project.js";
 
 const METHOD_BY_ICAL: Record<string, CalendarSuggestionItem["method"]> = {
 	REQUEST: CalendarInviteMethod.Request,
@@ -20,11 +20,6 @@ const METHOD_BY_ICAL: Record<string, CalendarSuggestionItem["method"]> = {
 	PUBLISH: CalendarInviteMethod.Publish,
 };
 
-const readString = (component: ICAL.Component, name: string): string => {
-	const value = component.getFirstPropertyValue(name);
-	return typeof value === "string" ? value : "";
-};
-
 /**
  * A `CAL-ADDRESS` as a plain mail address. RFC 5545 3.3.3 writes one as a URI,
  * which in practice is always `mailto:`; a card shows a person, not a URI.