Skip to content

refactor(config): share the blank-to-undefined env preprocess #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
christian-macedo wants to merge 4 commits into
base: main
Choose a base branch
from
Open

refactor(config): share the blank-to-undefined env preprocess #206

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcc7b0f
refactor(config): share the blank-to-undefined env preprocess
christian-macedo Aug 28, 2026
5fd46c7
Merge branch 'main' into fix/config-blank-optional-env
christian-macedo Aug 31, 2026
35c8b5a
Merge branch 'main' into fix/config-blank-optional-env
adrian-lorenzo Sep 1, 2026
1b25730
Merge branch 'main' into fix/config-blank-optional-env
christian-macedo Sep 3, 2026
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
23 changes: 10 additions & 13 deletions services/api/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ import type { AppConfig } from "./types.js";
const repoRoot = join(dirname(fileURLToPath(import.meta.url)), "../../..");
loadDotenv({ path: join(repoRoot, ".env"), quiet: true });

const OptionalUrl = z.preprocess(
(value) => (typeof value === "string" && value.trim() === "" ? undefined : value),
z.string().url().optional(),
);
// .env templates ship optional keys as blank assignments (KEY=), which dotenv
// delivers as empty strings; every optional field must read those as unset.
const blankToUndefined = (value: unknown) =>
typeof value === "string" && value.trim() === "" ? undefined : value;

const OptionalUrl = z.preprocess(blankToUndefined, z.string().url().optional());

const OptionalGithubOrganization = z.preprocess(
(value) => (typeof value === "string" && value.trim() === "" ? undefined : value),
blankToUndefined,
z
.string()
.trim()
Expand All @@ -23,13 +25,8 @@ const OptionalGithubOrganization = z.preprocess(
.optional(),
);

// .env templates ship optional keys as blank assignments (KEY=), which dotenv
// delivers as empty strings — those must parse as unset, while a value that is
// actually set must still be non-empty.
const OptionalNonEmpty = z.preprocess(
(value) => (typeof value === "string" && value.trim() === "" ? undefined : value),
z.string().trim().min(1).optional(),
);
// A value that is actually set must still be non-empty after trimming.
const OptionalNonEmpty = z.preprocess(blankToUndefined, z.string().trim().min(1).optional());

const EnvSchema = z
.object({
Expand All @@ -40,7 +37,7 @@ const EnvSchema = z
WEB_URL: z.string().url().optional(),
FACILITY_PREVIEW_URL: OptionalUrl,
FACILITY_PREVIEW_SURFACE_TOKEN: z.preprocess(
(value) => (typeof value === "string" && value.trim() === "" ? undefined : value),
blankToUndefined,
z.string().min(32).max(128).optional(),
),
SANDBOX_API_URL: z.string().url().optional(),
Expand Down