Skip to content

Commit 0d192fc

Browse files
ryoppippiryoppippi
committed
fix!: loadUsageData -> loadDailyUsageData
1 parent 8982f56 commit 0d192fc

5 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎src/commands/daily.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
createTotalsObject,
88
getTotalTokens,
99
} from "../calculate-cost.ts";
10-
import { type LoadOptions, loadUsageData } from "../data-loader.ts";
10+
import { type LoadOptions, loadDailyUsageData } from "../data-loader.ts";
1111
import { detectMismatches, printMismatchReport } from "../debug.ts";
1212
import { log, logger } from "../logger.ts";
1313
import { sharedCommandConfig } from "../shared-args.ts";
@@ -28,7 +28,7 @@ export const dailyCommand = define({
2828
claudePath: ctx.values.path,
2929
mode: ctx.values.mode,
3030
};
31-
const dailyData = await loadUsageData(options);
31+
const dailyData = await loadDailyUsageData(options);
3232

3333
if (dailyData.length === 0) {
3434
if (ctx.values.json) {

‎src/commands/monthly.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
createTotalsObject,
88
getTotalTokens,
99
} from "../calculate-cost.ts";
10-
import { type LoadOptions, loadUsageData } from "../data-loader.ts";
10+
import { type LoadOptions, loadDailyUsageData } from "../data-loader.ts";
1111
import type { DailyUsage } from "../data-loader.ts";
1212
import { detectMismatches, printMismatchReport } from "../debug.ts";
1313
import { log, logger } from "../logger.ts";
@@ -69,7 +69,7 @@ export const monthlyCommand = define({
6969
claudePath: ctx.values.path,
7070
mode: ctx.values.mode,
7171
};
72-
const dailyData = await loadUsageData(options);
72+
const dailyData = await loadDailyUsageData(options);
7373

7474
if (dailyData.length === 0) {
7575
if (ctx.values.json) {

‎src/data-loader.test.ts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
type UsageData,
66
calculateCostForEntry,
77
formatDate,
8+
loadDailyUsageData,
89
loadSessionData,
9-
loadUsageData,
1010
} from "./data-loader.ts";
1111
import {
1212
clearPricingCache,
@@ -33,13 +33,13 @@ describe("formatDate", () => {
3333
});
3434
});
3535

36-
describe("loadUsageData", () => {
36+
describe("loadDailyUsageData", () => {
3737
test("returns empty array when no files found", async () => {
3838
await using fixture = await createFixture({
3939
projects: {},
4040
});
4141

42-
const result = await loadUsageData({ claudePath: fixture.path });
42+
const result = await loadDailyUsageData({ claudePath: fixture.path });
4343
expect(result).toEqual([]);
4444
});
4545

@@ -76,7 +76,7 @@ describe("loadUsageData", () => {
7676
},
7777
});
7878

79-
const result = await loadUsageData({ claudePath: fixture.path });
79+
const result = await loadDailyUsageData({ claudePath: fixture.path });
8080

8181
expect(result).toHaveLength(1);
8282
expect(result[0]?.date).toBe("2024-01-01");
@@ -109,7 +109,7 @@ describe("loadUsageData", () => {
109109
},
110110
});
111111

112-
const result = await loadUsageData({ claudePath: fixture.path });
112+
const result = await loadDailyUsageData({ claudePath: fixture.path });
113113

114114
expect(result[0]?.cacheCreationTokens).toBe(25);
115115
expect(result[0]?.cacheReadTokens).toBe(10);
@@ -144,7 +144,7 @@ describe("loadUsageData", () => {
144144
},
145145
});
146146

147-
const result = await loadUsageData({
147+
const result = await loadDailyUsageData({
148148
claudePath: fixture.path,
149149
since: "20240110",
150150
until: "20240125",
@@ -184,7 +184,7 @@ describe("loadUsageData", () => {
184184
},
185185
});
186186

187-
const result = await loadUsageData({ claudePath: fixture.path });
187+
const result = await loadDailyUsageData({ claudePath: fixture.path });
188188

189189
expect(result[0]?.date).toBe("2024-01-31");
190190
expect(result[1]?.date).toBe("2024-01-15");
@@ -210,7 +210,7 @@ invalid json line
210210
},
211211
});
212212

213-
const result = await loadUsageData({ claudePath: fixture.path });
213+
const result = await loadDailyUsageData({ claudePath: fixture.path });
214214

215215
// Should only process valid lines
216216
expect(result).toHaveLength(1);
@@ -238,7 +238,7 @@ invalid json line
238238
},
239239
});
240240

241-
const result = await loadUsageData({ claudePath: fixture.path });
241+
const result = await loadDailyUsageData({ claudePath: fixture.path });
242242

243243
// Should only include valid entries
244244
expect(result).toHaveLength(1);
@@ -481,7 +481,7 @@ describe("data-loader cost calculation with real pricing", () => {
481481
clearPricingCache();
482482
});
483483

484-
describe("loadUsageData with mixed schemas", () => {
484+
describe("loadDailyUsageData with mixed schemas", () => {
485485
test("should handle old schema with costUSD", async () => {
486486
const oldData = {
487487
timestamp: "2024-01-15T10:00:00Z",
@@ -504,7 +504,7 @@ describe("data-loader cost calculation with real pricing", () => {
504504
},
505505
});
506506

507-
const results = await loadUsageData({ claudePath: fixture.path });
507+
const results = await loadDailyUsageData({ claudePath: fixture.path });
508508

509509
expect(results).toHaveLength(1);
510510
expect(results[0]?.date).toBe("2024-01-15");
@@ -540,7 +540,7 @@ describe("data-loader cost calculation with real pricing", () => {
540540
},
541541
});
542542

543-
const results = await loadUsageData({ claudePath: fixture.path });
543+
const results = await loadDailyUsageData({ claudePath: fixture.path });
544544

545545
expect(results).toHaveLength(1);
546546
expect(results[0]?.date).toBe("2024-01-16");
@@ -580,7 +580,7 @@ describe("data-loader cost calculation with real pricing", () => {
580580
},
581581
});
582582

583-
const results = await loadUsageData({ claudePath: fixture.path });
583+
const results = await loadDailyUsageData({ claudePath: fixture.path });
584584

585585
expect(results).toHaveLength(1);
586586
expect(results[0]?.date).toBe("2024-01-16");
@@ -624,7 +624,7 @@ describe("data-loader cost calculation with real pricing", () => {
624624
},
625625
});
626626

627-
const results = await loadUsageData({ claudePath: fixture.path });
627+
const results = await loadDailyUsageData({ claudePath: fixture.path });
628628

629629
expect(results).toHaveLength(1);
630630
expect(results[0]?.date).toBe("2024-01-17");
@@ -652,7 +652,7 @@ describe("data-loader cost calculation with real pricing", () => {
652652
},
653653
});
654654

655-
const results = await loadUsageData({ claudePath: fixture.path });
655+
const results = await loadDailyUsageData({ claudePath: fixture.path });
656656

657657
expect(results).toHaveLength(1);
658658
expect(results[0]?.inputTokens).toBe(500);
@@ -758,7 +758,7 @@ describe("data-loader cost calculation with real pricing", () => {
758758
},
759759
});
760760

761-
const results = await loadUsageData({ claudePath: fixture.path });
761+
const results = await loadDailyUsageData({ claudePath: fixture.path });
762762

763763
expect(results).toHaveLength(1);
764764
expect(results[0]?.date).toBe("2024-01-20");
@@ -795,7 +795,7 @@ describe("data-loader cost calculation with real pricing", () => {
795795
},
796796
});
797797

798-
const results = await loadUsageData({ claudePath: fixture.path });
798+
const results = await loadDailyUsageData({ claudePath: fixture.path });
799799

800800
expect(results).toHaveLength(1);
801801
expect(results[0]?.date).toBe("2024-01-20");
@@ -839,7 +839,7 @@ describe("data-loader cost calculation with real pricing", () => {
839839
},
840840
});
841841

842-
const results = await loadUsageData({
842+
const results = await loadDailyUsageData({
843843
claudePath: fixture.path,
844844
mode: "auto",
845845
});
@@ -868,7 +868,7 @@ describe("data-loader cost calculation with real pricing", () => {
868868
},
869869
});
870870

871-
const results = await loadUsageData({
871+
const results = await loadDailyUsageData({
872872
claudePath: fixture.path,
873873
mode: "calculate",
874874
});
@@ -907,7 +907,7 @@ describe("data-loader cost calculation with real pricing", () => {
907907
},
908908
});
909909

910-
const results = await loadUsageData({
910+
const results = await loadDailyUsageData({
911911
claudePath: fixture.path,
912912
mode: "display",
913913
});
@@ -978,7 +978,7 @@ describe("data-loader cost calculation with real pricing", () => {
978978
});
979979

980980
// In display mode, only pre-calculated costUSD should be used
981-
const results = await loadUsageData({
981+
const results = await loadDailyUsageData({
982982
claudePath: fixture.path,
983983
mode: "display",
984984
});
@@ -1008,7 +1008,7 @@ describe("data-loader cost calculation with real pricing", () => {
10081008
});
10091009

10101010
// This should fetch pricing data (will call real fetch)
1011-
const results = await loadUsageData({
1011+
const results = await loadDailyUsageData({
10121012
claudePath: fixture.path,
10131013
mode: "calculate",
10141014
});
@@ -1039,7 +1039,7 @@ describe("data-loader cost calculation with real pricing", () => {
10391039
});
10401040

10411041
// This should fetch pricing data (will call real fetch)
1042-
const results = await loadUsageData({
1042+
const results = await loadDailyUsageData({
10431043
claudePath: fixture.path,
10441044
mode: "auto",
10451045
});
@@ -1102,7 +1102,7 @@ describe("data-loader cost calculation with real pricing", () => {
11021102
// by using an unknown model that would cause pricing lookup to fail
11031103
// if it were attempted. Since we're in display mode, it should just
11041104
// use the costUSD value.
1105-
const results = await loadUsageData({
1105+
const results = await loadDailyUsageData({
11061106
claudePath: fixture.path,
11071107
mode: "display",
11081108
});

‎src/data-loader.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export interface LoadOptions extends DateFilter {
110110
mode?: CostMode; // Cost calculation mode
111111
}
112112

113-
export async function loadUsageData(
113+
export async function loadDailyUsageData(
114114
options?: LoadOptions,
115115
): Promise<DailyUsage[]> {
116116
const claudePath = options?.claudePath ?? getDefaultClaudePath();

‎src/mcp.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { CostModes, dateSchema } from "./types";
55

66
import {
77
getDefaultClaudePath,
8+
loadDailyUsageData,
89
loadSessionData,
9-
loadUsageData,
1010
} from "./data-loader";
1111
import type { LoadOptions } from "./data-loader";
1212
import type { CostMode } from "./types";
@@ -59,7 +59,7 @@ export function createMcpServer({
5959
description: "Show usage report grouped by date",
6060
parameters: parametersSchema,
6161
execute: async (args) => {
62-
const dailyData = await loadUsageData({ ...args, claudePath });
62+
const dailyData = await loadDailyUsageData({ ...args, claudePath });
6363
return JSON.stringify(dailyData);
6464
},
6565
});

0 commit comments

Comments
 (0)