ccusage 0.4.2 → 0.6.0

package/dist/{data-loader-B8mdiY5r.js → data-loader-CDv0IYZx.js}

@@ -1,5 +1,5 @@
-import { array, number, object, optional, safeParse, string } from "./dist-D6rk8Ra5.js";
-import { calculateCostFromTokens, fetchModelPricing, getModelPricing } from "./pricing-fetcher-bvi4lbXl.js";
+import { array, number, object, optional, pipe, regex, safeParse, string } from "./dist-FwNhpFrW.js";
+import { calculateCostFromTokens, fetchModelPricing, getModelPricing } from "./pricing-fetcher-BCv1Vods.js";
 import { createRequire } from "node:module";
 import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
@@ -2110,9 +2110,9 @@ var require_picomatch$1 = __commonJS({ "node_modules/picomatch/lib/picomatch.js"
 		if (glob$1 === "" || typeof glob$1 !== "string" && !isState) throw new TypeError("Expected pattern to be a non-empty string");
 		const opts = options || {};
 		const posix$1 = opts.windows;
-		const regex = isState ? picomatch$2.compileRe(glob$1, options) : picomatch$2.makeRe(glob$1, options, false, true);
-		const state = regex.state;
-		delete regex.state;
+		const regex$1 = isState ? picomatch$2.compileRe(glob$1, options) : picomatch$2.makeRe(glob$1, options, false, true);
+		const state = regex$1.state;
+		delete regex$1.state;
 		let isIgnored = () => false;
 		if (opts.ignore) {
 			const ignoreOpts = {
@@ -2124,14 +2124,14 @@ var require_picomatch$1 = __commonJS({ "node_modules/picomatch/lib/picomatch.js"
 			isIgnored = picomatch$2(opts.ignore, ignoreOpts, returnState);
 		}
 		const matcher = (input, returnObject = false) => {
-			const { isMatch, match, output } = picomatch$2.test(input, regex, options, {
+			const { isMatch, match, output } = picomatch$2.test(input, regex$1, options, {
 				glob: glob$1,
 				posix: posix$1
 			});
 			const result = {
 				glob: glob$1,
 				state,
-				regex,
+				regex: regex$1,
 				posix: posix$1,
 				input,
 				output,
@@ -2170,7 +2170,7 @@ var require_picomatch$1 = __commonJS({ "node_modules/picomatch/lib/picomatch.js"
 	* @return {Object} Returns an object with matching info.
 	* @api public
 	*/
-	picomatch$2.test = (input, regex, options, { glob: glob$1, posix: posix$1 } = {}) => {
+	picomatch$2.test = (input, regex$1, options, { glob: glob$1, posix: posix$1 } = {}) => {
 		if (typeof input !== "string") throw new TypeError("Expected input to be a string");
 		if (input === "") return {
 			isMatch: false,
@@ -2184,8 +2184,8 @@ var require_picomatch$1 = __commonJS({ "node_modules/picomatch/lib/picomatch.js"
 			output = format ? format(input) : input;
 			match = output === glob$1;
 		}
-		if (match === false || opts.capture === true) if (opts.matchBase === true || opts.basename === true) match = picomatch$2.matchBase(input, regex, options, posix$1);
-		else match = regex.exec(output);
+		if (match === false || opts.capture === true) if (opts.matchBase === true || opts.basename === true) match = picomatch$2.matchBase(input, regex$1, options, posix$1);
+		else match = regex$1.exec(output);
 		return {
 			isMatch: Boolean(match),
 			match,
@@ -2206,8 +2206,8 @@ var require_picomatch$1 = __commonJS({ "node_modules/picomatch/lib/picomatch.js"
 	* @api public
 	*/
 	picomatch$2.matchBase = (input, glob$1, options) => {
-		const regex = glob$1 instanceof RegExp ? glob$1 : picomatch$2.makeRe(glob$1, options);
-		return regex.test(utils$1.basename(input));
+		const regex$1 = glob$1 instanceof RegExp ? glob$1 : picomatch$2.makeRe(glob$1, options);
+		return regex$1.test(utils$1.basename(input));
 	};
 	/**
 	* Returns true if **any** of the given glob `patterns` match the specified `string`.
@@ -2291,9 +2291,9 @@ var require_picomatch$1 = __commonJS({ "node_modules/picomatch/lib/picomatch.js"
 		const append = opts.contains ? "" : "$";
 		let source = `${prepend}(?:${state.output})${append}`;
 		if (state && state.negated === true) source = `^(?!${source}).*$`;
-		const regex = picomatch$2.toRegex(source, options);
-		if (returnState === true) regex.state = state;
-		return regex;
+		const regex$1 = picomatch$2.toRegex(source, options);
+		if (returnState === true) regex$1.state = state;
+		return regex$1;
 	};
 	/**
 	* Create a regular expression from a parsed glob pattern.
@@ -2573,14 +2573,14 @@ function getPartialMatcher(patterns, options) {
 		if (inputParts[0] === ".." && ONLY_PARENT_DIRECTORIES.test(input)) return true;
 		for (let i = 0; i < patterns.length; i++) {
 			const patternParts = patternsParts[i];
-			const regex = regexes[i];
+			const regex$1 = regexes[i];
 			const inputPatternCount = inputParts.length;
 			const minParts = Math.min(inputPatternCount, patternParts.length);
 			let j = 0;
 			while (j < minParts) {
 				const part = patternParts[j];
 				if (part.includes("/")) return true;
-				const match = regex[j].test(inputParts[j]);
+				const match = regex$1[j].test(inputParts[j]);
 				if (!match) break;
 				if (part === "**") return true;
 				j++;
@@ -2786,7 +2786,7 @@ const UsageDataSchema = object({
 	costUSD: optional(number())
 });
 const DailyUsageSchema = object({
-	date: string(),
+	date: pipe(string(), regex(/^\d{4}-\d{2}-\d{2}$/)),
 	inputTokens: number(),
 	outputTokens: number(),
 	cacheCreationTokens: number(),
@@ -2804,6 +2804,14 @@ const SessionUsageSchema = object({
 	lastActivity: string(),
 	versions: array(string())
 });
+const MonthlyUsageSchema = object({
+	month: pipe(string(), regex(/^\d{4}-\d{2}$/)),
+	inputTokens: number(),
+	outputTokens: number(),
+	cacheCreationTokens: number(),
+	cacheReadTokens: number(),
+	totalCost: number()
+});
 const formatDate = (dateStr) => {
 	const date = new Date(dateStr);
 	const year = date.getFullYear();
@@ -2827,7 +2835,7 @@ const calculateCostForEntry = (data, mode, modelPricing) => {
 	}
 	return 0;
 };
-async function loadUsageData(options) {
+async function loadDailyUsageData(options) {
 	const claudePath = options?.claudePath ?? getDefaultClaudePath();
 	const claudeDir = path.join(claudePath, "projects");
 	const files = await glob(["**/*.jsonl"], {
@@ -2871,7 +2879,9 @@ async function loadUsageData(options) {
 		if (options.until && dateStr > options.until) return false;
 		return true;
 	});
-	return sort(results).desc((item) => new Date(item.date).getTime());
+	const sortOrder = options?.order || "desc";
+	const sortedResults = sort(results);
+	return sortOrder === "desc" ? sortedResults.desc((item) => new Date(item.date).getTime()) : sortedResults.asc((item) => new Date(item.date).getTime());
 }
 async function loadSessionData(options) {
 	const claudePath = options?.claudePath ?? getDefaultClaudePath();
@@ -2937,8 +2947,35 @@ async function loadSessionData(options) {
 		if (options.until && dateStr > options.until) return false;
 		return true;
 	});
-	return sort(results).desc((item) => new Date(item.lastActivity).getTime());
+	const sortOrder = options?.order || "desc";
+	const sortedResults = sort(results);
+	return sortOrder === "desc" ? sortedResults.desc((item) => new Date(item.lastActivity).getTime()) : sortedResults.asc((item) => new Date(item.lastActivity).getTime());
+}
+async function loadMonthlyUsageData(options) {
+	const dailyData = await loadDailyUsageData(options);
+	const monthlyMap = new Map();
+	for (const data of dailyData) {
+		const month = data.date.substring(0, 7);
+		const existing = monthlyMap.get(month) || {
+			month,
+			inputTokens: 0,
+			outputTokens: 0,
+			cacheCreationTokens: 0,
+			cacheReadTokens: 0,
+			totalCost: 0
+		};
+		existing.inputTokens += data.inputTokens;
+		existing.outputTokens += data.outputTokens;
+		existing.cacheCreationTokens += data.cacheCreationTokens;
+		existing.cacheReadTokens += data.cacheReadTokens;
+		existing.totalCost += data.totalCost;
+		monthlyMap.set(month, existing);
+	}
+	const monthlyArray = Array.from(monthlyMap.values());
+	const sortOrder = options?.order || "desc";
+	const sortedMonthly = sort(monthlyArray);
+	return sortOrder === "desc" ? sortedMonthly.desc((item) => item.month) : sortedMonthly.asc((item) => item.month);
 }
 
 //#endregion
-export { DailyUsageSchema, SessionUsageSchema, UsageDataSchema, __commonJS, __require, __toESM, calculateCostForEntry, formatDate, getDefaultClaudePath, glob, loadSessionData, loadUsageData };
+export { DailyUsageSchema, MonthlyUsageSchema, SessionUsageSchema, UsageDataSchema, __commonJS, __require, __toESM, calculateCostForEntry, formatDate, getDefaultClaudePath, glob, loadDailyUsageData, loadMonthlyUsageData, loadSessionData };

package/dist/{data-loader-DtCt7sNl.d.ts → data-loader-aUOjeZ06.d.ts}

@@ -1,6 +1,6 @@
-import { ArraySchema, InferOutput, NumberSchema, ObjectSchema, OptionalSchema, StringSchema } from "./index-Bazt8Nfd.js";
-import { ModelPricing } from "./pricing-fetcher-BqlslEH3.js";
-import { CostMode } from "./types-BfZ5dOy7.js";
+import { ArraySchema, InferOutput, NumberSchema, ObjectSchema, OptionalSchema, RegexAction, SchemaWithPipe, StringSchema } from "./index-BurjgCfW.js";
+import { ModelPricing } from "./pricing-fetcher-DygIroMj.js";
+import { CostMode, SortOrder } from "./types-y1JQzaKZ.js";
 
 //#region src/data-loader.d.ts
 declare const getDefaultClaudePath: () => string;
@@ -20,7 +20,7 @@ declare const UsageDataSchema: ObjectSchema<{
 }, undefined>;
 type UsageData = InferOutput<typeof UsageDataSchema>;
 declare const DailyUsageSchema: ObjectSchema<{
-  readonly date: StringSchema<undefined>;
+  readonly date: SchemaWithPipe<readonly [StringSchema<undefined>, RegexAction<string, undefined>]>;
   readonly inputTokens: NumberSchema<undefined>;
   readonly outputTokens: NumberSchema<undefined>;
   readonly cacheCreationTokens: NumberSchema<undefined>;
@@ -40,6 +40,15 @@ declare const SessionUsageSchema: ObjectSchema<{
   readonly versions: ArraySchema<StringSchema<undefined>, undefined>;
 }, undefined>;
 type SessionUsage = InferOutput<typeof SessionUsageSchema>;
+declare const MonthlyUsageSchema: ObjectSchema<{
+  readonly month: SchemaWithPipe<readonly [StringSchema<undefined>, RegexAction<string, undefined>]>;
+  readonly inputTokens: NumberSchema<undefined>;
+  readonly outputTokens: NumberSchema<undefined>;
+  readonly cacheCreationTokens: NumberSchema<undefined>;
+  readonly cacheReadTokens: NumberSchema<undefined>;
+  readonly totalCost: NumberSchema<undefined>;
+}, undefined>;
+type MonthlyUsage = InferOutput<typeof MonthlyUsageSchema>;
 declare const formatDate: (dateStr: string) => string;
 declare const calculateCostForEntry: (data: UsageData, mode: CostMode, modelPricing: Record<string, ModelPricing>) => number;
 interface DateFilter {
@@ -49,8 +58,10 @@ interface DateFilter {
 interface LoadOptions extends DateFilter {
   claudePath?: string;
   mode?: CostMode;
+  order?: SortOrder;
 }
-declare function loadUsageData(options?: LoadOptions): Promise<DailyUsage[]>;
+declare function loadDailyUsageData(options?: LoadOptions): Promise<DailyUsage[]>;
 declare function loadSessionData(options?: LoadOptions): Promise<SessionUsage[]>;
+declare function loadMonthlyUsageData(options?: LoadOptions): Promise<MonthlyUsage[]>;
 //#endregion
-export { DailyUsage, DailyUsageSchema as DailyUsageSchema$1, DateFilter, LoadOptions, SessionUsage, SessionUsageSchema as SessionUsageSchema$1, UsageData, UsageDataSchema as UsageDataSchema$1, calculateCostForEntry as calculateCostForEntry$1, formatDate as formatDate$1, getDefaultClaudePath as getDefaultClaudePath$1, loadSessionData as loadSessionData$1, loadUsageData as loadUsageData$1 };
+export { DailyUsage, DailyUsageSchema as DailyUsageSchema$1, DateFilter, LoadOptions, MonthlyUsage, MonthlyUsageSchema as MonthlyUsageSchema$1, SessionUsage, SessionUsageSchema as SessionUsageSchema$1, UsageData, UsageDataSchema as UsageDataSchema$1, calculateCostForEntry as calculateCostForEntry$1, formatDate as formatDate$1, getDefaultClaudePath as getDefaultClaudePath$1, loadDailyUsageData as loadDailyUsageData$1, loadMonthlyUsageData as loadMonthlyUsageData$1, loadSessionData as loadSessionData$1 };

package/dist/data-loader.d.ts

@@ -1,5 +1,5 @@
-import "./index-Bazt8Nfd.js";
-import "./pricing-fetcher-BqlslEH3.js";
-import "./types-BfZ5dOy7.js";
-import { DailyUsage, DailyUsageSchema$1 as DailyUsageSchema, DateFilter, LoadOptions, SessionUsage, SessionUsageSchema$1 as SessionUsageSchema, UsageData, UsageDataSchema$1 as UsageDataSchema, calculateCostForEntry$1 as calculateCostForEntry, formatDate$1 as formatDate, getDefaultClaudePath$1 as getDefaultClaudePath, loadSessionData$1 as loadSessionData, loadUsageData$1 as loadUsageData } from "./data-loader-DtCt7sNl.js";
-export { DailyUsage, DailyUsageSchema, DateFilter, LoadOptions, SessionUsage, SessionUsageSchema, UsageData, UsageDataSchema, calculateCostForEntry, formatDate, getDefaultClaudePath, loadSessionData, loadUsageData };
+import "./index-BurjgCfW.js";
+import "./pricing-fetcher-DygIroMj.js";
+import "./types-y1JQzaKZ.js";
+import { DailyUsage, DailyUsageSchema$1 as DailyUsageSchema, DateFilter, LoadOptions, MonthlyUsage, MonthlyUsageSchema$1 as MonthlyUsageSchema, SessionUsage, SessionUsageSchema$1 as SessionUsageSchema, UsageData, UsageDataSchema$1 as UsageDataSchema, calculateCostForEntry$1 as calculateCostForEntry, formatDate$1 as formatDate, getDefaultClaudePath$1 as getDefaultClaudePath, loadDailyUsageData$1 as loadDailyUsageData, loadMonthlyUsageData$1 as loadMonthlyUsageData, loadSessionData$1 as loadSessionData } from "./data-loader-aUOjeZ06.js";
+export { DailyUsage, DailyUsageSchema, DateFilter, LoadOptions, MonthlyUsage, MonthlyUsageSchema, SessionUsage, SessionUsageSchema, UsageData, UsageDataSchema, calculateCostForEntry, formatDate, getDefaultClaudePath, loadDailyUsageData, loadMonthlyUsageData, loadSessionData };

package/dist/data-loader.js

@@ -1,6 +1,6 @@
-import { DailyUsageSchema, SessionUsageSchema, UsageDataSchema, calculateCostForEntry, formatDate, getDefaultClaudePath, loadSessionData, loadUsageData } from "./data-loader-B8mdiY5r.js";
-import "./dist-D6rk8Ra5.js";
-import "./logger-nCODI08N.js";
-import "./pricing-fetcher-bvi4lbXl.js";
+import { DailyUsageSchema, MonthlyUsageSchema, SessionUsageSchema, UsageDataSchema, calculateCostForEntry, formatDate, getDefaultClaudePath, loadDailyUsageData, loadMonthlyUsageData, loadSessionData } from "./data-loader-CDv0IYZx.js";
+import "./dist-FwNhpFrW.js";
+import "./logger-DhDyJEC5.js";
+import "./pricing-fetcher-BCv1Vods.js";
 
-export { DailyUsageSchema, SessionUsageSchema, UsageDataSchema, calculateCostForEntry, formatDate, getDefaultClaudePath, loadSessionData, loadUsageData };
+export { DailyUsageSchema, MonthlyUsageSchema, SessionUsageSchema, UsageDataSchema, calculateCostForEntry, formatDate, getDefaultClaudePath, loadDailyUsageData, loadMonthlyUsageData, loadSessionData };

package/dist/{debug-Oce2b5bO.js → debug-Dk36WQTw.js}

@@ -1,7 +1,7 @@
-import { UsageDataSchema, glob } from "./data-loader-B8mdiY5r.js";
-import { safeParse } from "./dist-D6rk8Ra5.js";
-import { logger } from "./logger-nCODI08N.js";
-import { calculateCostFromTokens, fetchModelPricing, getModelPricing } from "./pricing-fetcher-bvi4lbXl.js";
+import { UsageDataSchema, glob } from "./data-loader-CDv0IYZx.js";
+import { safeParse } from "./dist-FwNhpFrW.js";
+import { logger } from "./logger-DhDyJEC5.js";
+import { calculateCostFromTokens, fetchModelPricing, getModelPricing } from "./pricing-fetcher-BCv1Vods.js";
 import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import path from "node:path";

package/dist/debug.js

@@ -1,7 +1,7 @@
-import "./data-loader-B8mdiY5r.js";
-import "./dist-D6rk8Ra5.js";
-import "./logger-nCODI08N.js";
-import "./pricing-fetcher-bvi4lbXl.js";
-import { detectMismatches, printMismatchReport } from "./debug-Oce2b5bO.js";
+import "./data-loader-CDv0IYZx.js";
+import "./dist-FwNhpFrW.js";
+import "./logger-DhDyJEC5.js";
+import "./pricing-fetcher-BCv1Vods.js";
+import { detectMismatches, printMismatchReport } from "./debug-Dk36WQTw.js";
 
 export { detectMismatches, printMismatchReport };