fix: use PascalCase for FeedItemType members (#51)

Rename camelCase members to PascalCase in WeatherFeedItemType
and CalendarFeedItemType to match TflFeedItemType and
CalDavFeedItemType conventions.

Co-authored-by: Ona <no-reply@ona.com>
This commit is contained in:
2026-03-01 22:10:34 +00:00
committed by GitHub
parent 4c9ac2c61a
commit 8ca8a0d1d2
9 changed files with 47 additions and 47 deletions

View File

@@ -39,7 +39,7 @@ describe("WeatherKitDataSource", () => {
credentials: mockCredentials, credentials: mockCredentials,
}) })
expect(dataSource.type).toBe(WeatherFeedItemType.current) expect(dataSource.type).toBe(WeatherFeedItemType.Current)
}) })
test("throws error if neither client nor credentials provided", () => { test("throws error if neither client nor credentials provided", () => {
@@ -130,9 +130,9 @@ describe("query() with mocked client", () => {
const items = await dataSource.query(context) const items = await dataSource.query(context)
expect(items.length).toBeGreaterThan(0) expect(items.length).toBeGreaterThan(0)
expect(items.some((i) => i.type === WeatherFeedItemType.current)).toBe(true) expect(items.some((i) => i.type === WeatherFeedItemType.Current)).toBe(true)
expect(items.some((i) => i.type === WeatherFeedItemType.hourly)).toBe(true) expect(items.some((i) => i.type === WeatherFeedItemType.Hourly)).toBe(true)
expect(items.some((i) => i.type === WeatherFeedItemType.daily)).toBe(true) expect(items.some((i) => i.type === WeatherFeedItemType.Daily)).toBe(true)
}) })
test("applies hourly and daily limits", async () => { test("applies hourly and daily limits", async () => {
@@ -145,8 +145,8 @@ describe("query() with mocked client", () => {
const items = await dataSource.query(context) const items = await dataSource.query(context)
const hourlyItems = items.filter((i) => i.type === WeatherFeedItemType.hourly) const hourlyItems = items.filter((i) => i.type === WeatherFeedItemType.Hourly)
const dailyItems = items.filter((i) => i.type === WeatherFeedItemType.daily) const dailyItems = items.filter((i) => i.type === WeatherFeedItemType.Daily)
expect(hourlyItems.length).toBe(3) expect(hourlyItems.length).toBe(3)
expect(dailyItems.length).toBe(2) expect(dailyItems.length).toBe(2)
@@ -176,8 +176,8 @@ describe("query() with mocked client", () => {
units: Units.imperial, units: Units.imperial,
}) })
const metricCurrent = metricItems.find((i) => i.type === WeatherFeedItemType.current) const metricCurrent = metricItems.find((i) => i.type === WeatherFeedItemType.Current)
const imperialCurrent = imperialItems.find((i) => i.type === WeatherFeedItemType.current) const imperialCurrent = imperialItems.find((i) => i.type === WeatherFeedItemType.Current)
expect(metricCurrent).toBeDefined() expect(metricCurrent).toBeDefined()
expect(imperialCurrent).toBeDefined() expect(imperialCurrent).toBeDefined()
@@ -203,7 +203,7 @@ describe("query() with mocked client", () => {
expect(item.signals!.timeRelevance).toBeDefined() expect(item.signals!.timeRelevance).toBeDefined()
} }
const currentItem = items.find((i) => i.type === WeatherFeedItemType.current) const currentItem = items.find((i) => i.type === WeatherFeedItemType.Current)
expect(currentItem).toBeDefined() expect(currentItem).toBeDefined()
expect(currentItem!.signals!.urgency).toBeGreaterThanOrEqual(0.5) expect(currentItem!.signals!.urgency).toBeGreaterThanOrEqual(0.5)
}) })

View File

@@ -44,7 +44,7 @@ export class WeatherKitDataSource implements DataSource<WeatherFeedItem, Weather
private readonly DEFAULT_HOURLY_LIMIT = 12 private readonly DEFAULT_HOURLY_LIMIT = 12
private readonly DEFAULT_DAILY_LIMIT = 7 private readonly DEFAULT_DAILY_LIMIT = 7
readonly type = WeatherFeedItemType.current readonly type = WeatherFeedItemType.Current
private readonly client: WeatherKitClient private readonly client: WeatherKitClient
private readonly hourlyLimit: number private readonly hourlyLimit: number
private readonly dailyLimit: number private readonly dailyLimit: number
@@ -228,7 +228,7 @@ function createCurrentWeatherFeedItem(
return { return {
id: `weather-current-${timestamp.getTime()}`, id: `weather-current-${timestamp.getTime()}`,
type: WeatherFeedItemType.current, type: WeatherFeedItemType.Current,
timestamp, timestamp,
data: { data: {
conditionCode: current.conditionCode, conditionCode: current.conditionCode,
@@ -262,7 +262,7 @@ function createHourlyWeatherFeedItem(
return { return {
id: `weather-hourly-${timestamp.getTime()}-${index}`, id: `weather-hourly-${timestamp.getTime()}-${index}`,
type: WeatherFeedItemType.hourly, type: WeatherFeedItemType.Hourly,
timestamp, timestamp,
data: { data: {
forecastTime: new Date(hourly.forecastStart), forecastTime: new Date(hourly.forecastStart),
@@ -296,7 +296,7 @@ function createDailyWeatherFeedItem(
return { return {
id: `weather-daily-${timestamp.getTime()}-${index}`, id: `weather-daily-${timestamp.getTime()}-${index}`,
type: WeatherFeedItemType.daily, type: WeatherFeedItemType.Daily,
timestamp, timestamp,
data: { data: {
forecastDate: new Date(daily.forecastStart), forecastDate: new Date(daily.forecastStart),
@@ -323,7 +323,7 @@ function createWeatherAlertFeedItem(alert: WeatherAlert, timestamp: Date): Weath
return { return {
id: `weather-alert-${alert.id}`, id: `weather-alert-${alert.id}`,
type: WeatherFeedItemType.alert, type: WeatherFeedItemType.Alert,
timestamp, timestamp,
data: { data: {
alertId: alert.id, alertId: alert.id,

View File

@@ -3,10 +3,10 @@ import type { FeedItem } from "@aris/core"
import type { Certainty, ConditionCode, PrecipitationType, Severity, Urgency } from "./weatherkit" import type { Certainty, ConditionCode, PrecipitationType, Severity, Urgency } from "./weatherkit"
export const WeatherFeedItemType = { export const WeatherFeedItemType = {
current: "weather-current", Current: "weather-current",
hourly: "weather-hourly", Hourly: "weather-hourly",
daily: "weather-daily", Daily: "weather-daily",
alert: "weather-alert", Alert: "weather-alert",
} as const } as const
export type WeatherFeedItemType = (typeof WeatherFeedItemType)[keyof typeof WeatherFeedItemType] export type WeatherFeedItemType = (typeof WeatherFeedItemType)[keyof typeof WeatherFeedItemType]
@@ -28,7 +28,7 @@ export type CurrentWeatherData = {
} }
export interface CurrentWeatherFeedItem extends FeedItem< export interface CurrentWeatherFeedItem extends FeedItem<
typeof WeatherFeedItemType.current, typeof WeatherFeedItemType.Current,
CurrentWeatherData CurrentWeatherData
> {} > {}
@@ -49,7 +49,7 @@ export type HourlyWeatherData = {
} }
export interface HourlyWeatherFeedItem extends FeedItem< export interface HourlyWeatherFeedItem extends FeedItem<
typeof WeatherFeedItemType.hourly, typeof WeatherFeedItemType.Hourly,
HourlyWeatherData HourlyWeatherData
> {} > {}
@@ -68,7 +68,7 @@ export type DailyWeatherData = {
} }
export interface DailyWeatherFeedItem extends FeedItem< export interface DailyWeatherFeedItem extends FeedItem<
typeof WeatherFeedItemType.daily, typeof WeatherFeedItemType.Daily,
DailyWeatherData DailyWeatherData
> {} > {}
@@ -86,7 +86,7 @@ export type WeatherAlertData = {
} }
export interface WeatherAlertFeedItem extends FeedItem< export interface WeatherAlertFeedItem extends FeedItem<
typeof WeatherFeedItemType.alert, typeof WeatherFeedItemType.Alert,
WeatherAlertData WeatherAlertData
> {} > {}

View File

@@ -3,19 +3,19 @@ import type { FeedItem } from "@aris/core"
import type { CalendarEventData } from "./types" import type { CalendarEventData } from "./types"
export const CalendarFeedItemType = { export const CalendarFeedItemType = {
event: "calendar-event", Event: "calendar-event",
allDay: "calendar-all-day", AllDay: "calendar-all-day",
} as const } as const
export type CalendarFeedItemType = (typeof CalendarFeedItemType)[keyof typeof CalendarFeedItemType] export type CalendarFeedItemType = (typeof CalendarFeedItemType)[keyof typeof CalendarFeedItemType]
export interface CalendarEventFeedItem extends FeedItem< export interface CalendarEventFeedItem extends FeedItem<
typeof CalendarFeedItemType.event, typeof CalendarFeedItemType.Event,
CalendarEventData CalendarEventData
> {} > {}
export interface CalendarAllDayFeedItem extends FeedItem< export interface CalendarAllDayFeedItem extends FeedItem<
typeof CalendarFeedItemType.allDay, typeof CalendarFeedItemType.AllDay,
CalendarEventData CalendarEventData
> {} > {}

View File

@@ -69,7 +69,7 @@ describe("GoogleCalendarSource", () => {
const source = new GoogleCalendarSource({ client: defaultMockClient() }) const source = new GoogleCalendarSource({ client: defaultMockClient() })
const items = await source.fetchItems(createContext()) const items = await source.fetchItems(createContext())
const timedItems = items.filter((i) => i.type === CalendarFeedItemType.event) const timedItems = items.filter((i) => i.type === CalendarFeedItemType.Event)
expect(timedItems.length).toBe(4) expect(timedItems.length).toBe(4)
}) })
@@ -77,7 +77,7 @@ describe("GoogleCalendarSource", () => {
const source = new GoogleCalendarSource({ client: defaultMockClient() }) const source = new GoogleCalendarSource({ client: defaultMockClient() })
const items = await source.fetchItems(createContext()) const items = await source.fetchItems(createContext())
const allDayItems = items.filter((i) => i.type === CalendarFeedItemType.allDay) const allDayItems = items.filter((i) => i.type === CalendarFeedItemType.AllDay)
expect(allDayItems.length).toBe(1) expect(allDayItems.length).toBe(1)
}) })

View File

@@ -209,7 +209,7 @@ function createFeedItem(
nowMs: number, nowMs: number,
lookaheadMs: number, lookaheadMs: number,
): CalendarFeedItem { ): CalendarFeedItem {
const itemType = event.isAllDay ? CalendarFeedItemType.allDay : CalendarFeedItemType.event const itemType = event.isAllDay ? CalendarFeedItemType.AllDay : CalendarFeedItemType.Event
return { return {
id: `calendar-${event.calendarId}-${event.eventId}`, id: `calendar-${event.calendarId}-${event.eventId}`,

View File

@@ -3,10 +3,10 @@ import type { FeedItem } from "@aris/core"
import type { Certainty, ConditionCode, PrecipitationType, Severity, Urgency } from "./weatherkit" import type { Certainty, ConditionCode, PrecipitationType, Severity, Urgency } from "./weatherkit"
export const WeatherFeedItemType = { export const WeatherFeedItemType = {
current: "weather-current", Current: "weather-current",
hourly: "weather-hourly", Hourly: "weather-hourly",
daily: "weather-daily", Daily: "weather-daily",
alert: "weather-alert", Alert: "weather-alert",
} as const } as const
export type WeatherFeedItemType = (typeof WeatherFeedItemType)[keyof typeof WeatherFeedItemType] export type WeatherFeedItemType = (typeof WeatherFeedItemType)[keyof typeof WeatherFeedItemType]
@@ -28,7 +28,7 @@ export type CurrentWeatherData = {
} }
export interface CurrentWeatherFeedItem extends FeedItem< export interface CurrentWeatherFeedItem extends FeedItem<
typeof WeatherFeedItemType.current, typeof WeatherFeedItemType.Current,
CurrentWeatherData CurrentWeatherData
> {} > {}
@@ -49,7 +49,7 @@ export type HourlyWeatherData = {
} }
export interface HourlyWeatherFeedItem extends FeedItem< export interface HourlyWeatherFeedItem extends FeedItem<
typeof WeatherFeedItemType.hourly, typeof WeatherFeedItemType.Hourly,
HourlyWeatherData HourlyWeatherData
> {} > {}
@@ -68,7 +68,7 @@ export type DailyWeatherData = {
} }
export interface DailyWeatherFeedItem extends FeedItem< export interface DailyWeatherFeedItem extends FeedItem<
typeof WeatherFeedItemType.daily, typeof WeatherFeedItemType.Daily,
DailyWeatherData DailyWeatherData
> {} > {}
@@ -86,7 +86,7 @@ export type WeatherAlertData = {
} }
export interface WeatherAlertFeedItem extends FeedItem< export interface WeatherAlertFeedItem extends FeedItem<
typeof WeatherFeedItemType.alert, typeof WeatherFeedItemType.Alert,
WeatherAlertData WeatherAlertData
> {} > {}

View File

@@ -110,9 +110,9 @@ describe("WeatherSource", () => {
const items = await source.fetchItems(context) const items = await source.fetchItems(context)
expect(items.length).toBeGreaterThan(0) expect(items.length).toBeGreaterThan(0)
expect(items.some((i) => i.type === WeatherFeedItemType.current)).toBe(true) expect(items.some((i) => i.type === WeatherFeedItemType.Current)).toBe(true)
expect(items.some((i) => i.type === WeatherFeedItemType.hourly)).toBe(true) expect(items.some((i) => i.type === WeatherFeedItemType.Hourly)).toBe(true)
expect(items.some((i) => i.type === WeatherFeedItemType.daily)).toBe(true) expect(items.some((i) => i.type === WeatherFeedItemType.Daily)).toBe(true)
}) })
test("applies hourly and daily limits", async () => { test("applies hourly and daily limits", async () => {
@@ -125,8 +125,8 @@ describe("WeatherSource", () => {
const items = await source.fetchItems(context) const items = await source.fetchItems(context)
const hourlyItems = items.filter((i) => i.type === WeatherFeedItemType.hourly) const hourlyItems = items.filter((i) => i.type === WeatherFeedItemType.Hourly)
const dailyItems = items.filter((i) => i.type === WeatherFeedItemType.daily) const dailyItems = items.filter((i) => i.type === WeatherFeedItemType.Daily)
expect(hourlyItems.length).toBe(3) expect(hourlyItems.length).toBe(3)
expect(dailyItems.length).toBe(2) expect(dailyItems.length).toBe(2)
@@ -158,7 +158,7 @@ describe("WeatherSource", () => {
expect(item.signals!.timeRelevance).toBeDefined() expect(item.signals!.timeRelevance).toBeDefined()
} }
const currentItem = items.find((i) => i.type === WeatherFeedItemType.current) const currentItem = items.find((i) => i.type === WeatherFeedItemType.Current)
expect(currentItem).toBeDefined() expect(currentItem).toBeDefined()
expect(currentItem!.signals!.urgency).toBeGreaterThanOrEqual(0.5) expect(currentItem!.signals!.urgency).toBeGreaterThanOrEqual(0.5)
}) })

View File

@@ -291,7 +291,7 @@ function createCurrentWeatherFeedItem(
return { return {
id: `weather-current-${timestamp.getTime()}`, id: `weather-current-${timestamp.getTime()}`,
type: WeatherFeedItemType.current, type: WeatherFeedItemType.Current,
timestamp, timestamp,
data: { data: {
conditionCode: current.conditionCode, conditionCode: current.conditionCode,
@@ -325,7 +325,7 @@ function createHourlyWeatherFeedItem(
return { return {
id: `weather-hourly-${timestamp.getTime()}-${index}`, id: `weather-hourly-${timestamp.getTime()}-${index}`,
type: WeatherFeedItemType.hourly, type: WeatherFeedItemType.Hourly,
timestamp, timestamp,
data: { data: {
forecastTime: new Date(hourly.forecastStart), forecastTime: new Date(hourly.forecastStart),
@@ -359,7 +359,7 @@ function createDailyWeatherFeedItem(
return { return {
id: `weather-daily-${timestamp.getTime()}-${index}`, id: `weather-daily-${timestamp.getTime()}-${index}`,
type: WeatherFeedItemType.daily, type: WeatherFeedItemType.Daily,
timestamp, timestamp,
data: { data: {
forecastDate: new Date(daily.forecastStart), forecastDate: new Date(daily.forecastStart),
@@ -386,7 +386,7 @@ function createWeatherAlertFeedItem(alert: WeatherAlert, timestamp: Date): Weath
return { return {
id: `weather-alert-${alert.id}`, id: `weather-alert-${alert.id}`,
type: WeatherFeedItemType.alert, type: WeatherFeedItemType.Alert,
timestamp, timestamp,
data: { data: {
alertId: alert.id, alertId: alert.id,