Skip to content

Commit 5dba413

Browse files
authored
refactor: use oxfmt for JSON schema formatting and remove OFFLINE env var (#746)
1 parent 54d98f7 commit 5dba413

9 files changed

Lines changed: 105 additions & 17 deletions

File tree

‎.oxfmtrc.jsonc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"$schema": "./node_modules/oxfmt/configuration_schema.json",
3+
"useTabs": true,
4+
"singleQuote": true
5+
}

‎apps/ccusage/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"scripts": {
3939
"build": "pnpm run generate:schema && tsdown",
4040
"format": "pnpm run lint --fix",
41-
"generate:schema": "OFFLINE=true bun scripts/generate-json-schema.ts",
41+
"generate:schema": "bun scripts/generate-json-schema.ts",
4242
"lint": "eslint --cache .",
4343
"prepack": "pnpm run build && clean-pkg-json",
4444
"prepare": "pnpm run generate:schema || true",

‎apps/ccusage/scripts/generate-json-schema.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ function createConfigSchemaJson() {
188188
/**
189189
* Generate JSON Schema and write to files
190190
*/
191-
async function runLint(files: string[]) {
191+
async function runFormat(files: string[]) {
192192
return Result.try({
193-
try: $`bun run lint --fix ${files}`,
193+
try: $`pnpm exec oxfmt ${files}`,
194194
catch: error => error,
195195
});
196196
}
@@ -270,17 +270,17 @@ async function generateJsonSchema() {
270270
// Copy to docs/public using Bun shell
271271
await copySchemaToDocsPublic();
272272

273-
// Run lint on the root schema file that was changed
273+
// Run format on the root schema file that was changed
274274
await Result.pipe(
275275
Result.try({
276-
try: runLint([SCHEMA_FILENAME]),
276+
try: runFormat([SCHEMA_FILENAME]),
277277
safe: true,
278278
}),
279279
Result.inspectError((error) => {
280-
logger.error('Failed to lint generated files:', error);
280+
logger.error('Failed to format generated files:', error);
281281
process.exit(1);
282282
}),
283-
Result.inspect(() => logger.info('✓ Linted generated files')),
283+
Result.inspect(() => logger.info('✓ Formatted generated files')),
284284
);
285285

286286
logger.info('JSON Schema generation completed successfully!');

‎apps/ccusage/src/_macro.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { LiteLLMModelPricing } from '@ccusage/internal/pricing';
2-
import process from 'node:process';
32
import {
43
createPricingDataset,
54
fetchLiteLLMPricingDataset,
@@ -13,10 +12,6 @@ function isClaudeModel(modelName: string, _pricing: LiteLLMModelPricing): boolea
1312
}
1413

1514
export async function prefetchClaudePricing(): Promise<Record<string, LiteLLMModelPricing>> {
16-
if (process.env.OFFLINE === 'true') {
17-
return createPricingDataset();
18-
}
19-
2015
try {
2116
const dataset = await fetchLiteLLMPricingDataset();
2217
return filterPricingDataset(dataset, isClaudeModel);

‎apps/ccusage/tsconfig.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"moduleResolution": "bundler",
1313
"resolveJsonModule": true,
1414
"types": [
15+
"@types/bun",
1516
"vitest/globals",
1617
"vitest/importMeta"
1718
],

‎apps/codex/src/_macro.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { LiteLLMModelPricing } from '@ccusage/internal/pricing';
2-
import process from 'node:process';
32
import {
43
createPricingDataset,
54
fetchLiteLLMPricingDataset,
@@ -19,10 +18,6 @@ function isCodexModel(modelName: string, _pricing: LiteLLMModelPricing): boolean
1918
}
2019

2120
export async function prefetchCodexPricing(): Promise<Record<string, LiteLLMModelPricing>> {
22-
if (process.env.OFFLINE === 'true') {
23-
return createPricingDataset();
24-
}
25-
2621
try {
2722
const dataset = await fetchLiteLLMPricingDataset();
2823
return filterPricingDataset(dataset, isCodexModel);

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"bumpp": "catalog:release",
3333
"eslint": "catalog:lint",
3434
"lint-staged": "catalog:release",
35+
"oxfmt": "catalog:lint",
3536
"sitemcp": "catalog:mcp",
3637
"sort-package-json": "catalog:release"
3738
},

‎pnpm-lock.yaml‎

Lines changed: 90 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pnpm-workspace.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ catalogs:
2424
'@ryoppippi/eslint-config': ^0.4.0
2525
eslint: ^9.33.0
2626
eslint-plugin-format: ^1.0.2
27+
oxfmt: ^0.16.0
2728
publint: ^0.3.12
2829
mcp:
2930
'@praha/byethrow-mcp': ^0.1.7

0 commit comments

Comments
 (0)