Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-walls-move.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@proofkit/typegen": patch
---

Find `proofkit.config.json` and `adt.config.json` when resolving typegen CLI config.
8 changes: 6 additions & 2 deletions packages/typegen/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ import { parse } from "jsonc-parser";
import { getFriendlyTypegenError } from "./cli-errors";
import { typegenConfig } from "./types";

const defaultConfigPaths = ["proofkit-typegen.config.jsonc", "proofkit-typegen.config.json"];
const defaultConfigNames = ["proofkit-typegen.config", "proofkit.config", "adt.config"];
const defaultConfigExtensions = ["jsonc", "json"];
const defaultConfigPaths = defaultConfigNames.flatMap((configName) =>
defaultConfigExtensions.map((extension) => `${configName}.${extension}`),
);
const oldConfigPaths = ["fmschema.config.mjs", "fmschema.config.js"];
interface ConfigArgs {
configLocation: string;
Expand Down Expand Up @@ -276,7 +280,7 @@ function parseEnvs(envPath?: string | undefined) {
// }
}

function getConfigPath(configPath?: string): string | null {
export function getConfigPath(configPath?: string): string | null {
if (configPath) {
// If a config path is specified, check if it exists
try {
Expand Down
47 changes: 47 additions & 0 deletions packages/typegen/tests/cli-config.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import fs from "node:fs";
import os from "node:os";
import path from "node:path";
import { afterEach, beforeEach, describe, expect, it } from "vitest";
import { getConfigPath } from "../src/cli";

let originalCwd: string;
let tempDir: string;

describe("typegen cli config lookup", () => {
beforeEach(() => {
originalCwd = process.cwd();
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "proofkit-typegen-config-"));
process.chdir(tempDir);
});

afterEach(() => {
process.chdir(originalCwd);
fs.rmSync(tempDir, { force: true, recursive: true });
});

it.each(["proofkit.config.jsonc", "proofkit.config.json"])("finds %s fallback files", (configPath) => {
fs.writeFileSync(configPath, "{}", "utf8");

expect(getConfigPath()).toBe(configPath);
});

it.each(["adt.config.jsonc", "adt.config.json"])("finds %s fallback files", (configPath) => {
fs.writeFileSync(configPath, "{}", "utf8");

expect(getConfigPath()).toBe(configPath);
});

it("prefers existing proofkit typegen configs", () => {
fs.writeFileSync("proofkit-typegen.config.json", "{}", "utf8");
fs.writeFileSync("proofkit.config.jsonc", "{}", "utf8");

expect(getConfigPath()).toBe("proofkit-typegen.config.json");
});

it("prefers jsonc before json for the same config name", () => {
fs.writeFileSync("proofkit.config.jsonc", "{}", "utf8");
fs.writeFileSync("proofkit.config.json", "{}", "utf8");

expect(getConfigPath()).toBe("proofkit.config.jsonc");
});
});
Loading