Skip to content

Commit a0b40a1

Browse files
charlesliencharleslien
committed
move env schemas to separate files
1 parent ff20d21 commit a0b40a1

6 files changed

Lines changed: 72 additions & 68 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
env:
4444
SECRETS_CONTEXT: ${{ toJSON(secrets) }}
4545
run: |
46-
VAR_NAMES=$(NEXT_PUBLIC_CB_ENVIRONMENT=test bun scripts/generate-ci-env.ts)
46+
VAR_NAMES=$(bun scripts/generate-ci-env.ts)
4747
echo "$SECRETS_CONTEXT" | jq -r --argjson vars "$VAR_NAMES" '
4848
to_entries | .[] | select(.key as $k | $vars | index($k)) | .key + "=" + .value
4949
' >> $GITHUB_ENV

‎common/src/env-schema.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import z from 'zod/v4'
2+
3+
export const CLIENT_ENV_PREFIX = 'NEXT_PUBLIC_'
4+
5+
export const clientEnvSchema = z.object({
6+
NEXT_PUBLIC_CB_ENVIRONMENT: z.enum(['dev', 'test', 'prod']),
7+
NEXT_PUBLIC_CODEBUFF_APP_URL: z.url().min(1),
8+
NEXT_PUBLIC_CODEBUFF_BACKEND_URL: z.string().min(1),
9+
NEXT_PUBLIC_SUPPORT_EMAIL: z.email().min(1),
10+
NEXT_PUBLIC_POSTHOG_API_KEY: z.string().optional().default(''),
11+
NEXT_PUBLIC_POSTHOG_HOST_URL: z.url().optional(),
12+
NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: z.string().min(1),
13+
NEXT_PUBLIC_STRIPE_CUSTOMER_PORTAL: z.url().min(1),
14+
NEXT_PUBLIC_LINKEDIN_PARTNER_ID: z.string().optional(),
15+
NEXT_PUBLIC_GOOGLE_SITE_VERIFICATION_ID: z.string().optional(),
16+
NEXT_PUBLIC_WEB_PORT: z.coerce.number().min(1000).optional().default(3000),
17+
} satisfies Record<`${typeof CLIENT_ENV_PREFIX}${string}`, any>)
18+
export const clientEnvVars = clientEnvSchema.keyof().options
19+
export type ClientEnvVar = (typeof clientEnvVars)[number]
20+
export type ClientInput = {
21+
[K in (typeof clientEnvVars)[number]]: string | undefined
22+
}
23+
export type ClientEnv = z.infer<typeof clientEnvSchema>

‎common/src/env.ts‎

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,12 @@
1-
import z from 'zod/v4'
1+
import { clientEnvSchema } from './env-schema'
2+
3+
import type { ClientInput } from './env-schema'
24

35
// Only log environment in non-production
46
if (process.env.NEXT_PUBLIC_CB_ENVIRONMENT !== 'prod') {
57
console.log('Using environment:', process.env.NEXT_PUBLIC_CB_ENVIRONMENT)
68
}
79

8-
export const CLIENT_ENV_PREFIX = 'NEXT_PUBLIC_'
9-
10-
export const clientEnvSchema = z.object({
11-
NEXT_PUBLIC_CB_ENVIRONMENT: z.enum(['dev', 'test', 'prod']),
12-
NEXT_PUBLIC_CODEBUFF_APP_URL: z.url().min(1),
13-
NEXT_PUBLIC_CODEBUFF_BACKEND_URL: z.string().min(1),
14-
NEXT_PUBLIC_SUPPORT_EMAIL: z.email().min(1),
15-
NEXT_PUBLIC_POSTHOG_API_KEY: z.string().optional().default(''),
16-
NEXT_PUBLIC_POSTHOG_HOST_URL: z.url().optional(),
17-
NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: z.string().min(1),
18-
NEXT_PUBLIC_STRIPE_CUSTOMER_PORTAL: z.url().min(1),
19-
NEXT_PUBLIC_LINKEDIN_PARTNER_ID: z.string().optional(),
20-
NEXT_PUBLIC_GOOGLE_SITE_VERIFICATION_ID: z.string().optional(),
21-
NEXT_PUBLIC_WEB_PORT: z.coerce.number().min(1000).optional().default(3000),
22-
} satisfies Record<`${typeof CLIENT_ENV_PREFIX}${string}`, any>)
23-
export const clientEnvVars = clientEnvSchema.keyof().options
24-
export type ClientEnvVar = (typeof clientEnvVars)[number]
25-
export type ClientInput = {
26-
[K in (typeof clientEnvVars)[number]]: string | undefined
27-
}
28-
export type ClientEnv = z.infer<typeof clientEnvSchema>
29-
3010
// Bun will inject all these values, so we need to reference them individually (no for-loops)
3111
export const clientProcessEnv: ClientInput = {
3212
NEXT_PUBLIC_CB_ENVIRONMENT: process.env.NEXT_PUBLIC_CB_ENVIRONMENT,
@@ -46,6 +26,4 @@ export const clientProcessEnv: ClientInput = {
4626
NEXT_PUBLIC_WEB_PORT: process.env.NEXT_PUBLIC_WEB_PORT,
4727
}
4828

49-
console.error({ clientProcessEnv }, 'asdf')
50-
5129
export const env = clientEnvSchema.parse(clientProcessEnv)

‎packages/internal/src/env-schema.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { clientEnvSchema } from '@codebuff/common/env-schema'
2+
import z from 'zod/v4'
3+
4+
export const serverEnvSchema = clientEnvSchema.extend({
5+
// Backend variables
6+
CODEBUFF_API_KEY: z.string().optional(),
7+
OPEN_ROUTER_API_KEY: z.string().min(1),
8+
RELACE_API_KEY: z.string().min(1),
9+
LINKUP_API_KEY: z.string().min(1),
10+
CONTEXT7_API_KEY: z.string().optional(),
11+
GOOGLE_CLOUD_PROJECT_ID: z.string().min(1),
12+
PORT: z.coerce.number().min(1000),
13+
14+
// Web/Database variables
15+
DATABASE_URL: z.string().min(1),
16+
GOOGLE_SITE_VERIFICATION_ID: z.string().optional(),
17+
CODEBUFF_GITHUB_ID: z.string().min(1),
18+
CODEBUFF_GITHUB_SECRET: z.string().min(1),
19+
NEXTAUTH_URL: z.url().optional(),
20+
NEXTAUTH_SECRET: z.string().min(1),
21+
STRIPE_SECRET_KEY: z.string().min(1),
22+
STRIPE_WEBHOOK_SECRET_KEY: z.string().min(1),
23+
STRIPE_USAGE_PRICE_ID: z.string().min(1),
24+
STRIPE_TEAM_FEE_PRICE_ID: z.string().min(1),
25+
LOOPS_API_KEY: z.string().min(1),
26+
DISCORD_PUBLIC_KEY: z.string().min(1),
27+
DISCORD_BOT_TOKEN: z.string().min(1),
28+
DISCORD_APPLICATION_ID: z.string().min(1),
29+
30+
// Common variables
31+
API_KEY_ENCRYPTION_SECRET: z.string().length(32),
32+
})
33+
export const serverEnvVars = serverEnvSchema.keyof().options
34+
export type ServerEnvVar = (typeof serverEnvVars)[number]
35+
export type ServerInput = {
36+
[K in (typeof serverEnvVars)[number]]: string | undefined
37+
}
38+
export type ServerEnv = z.infer<typeof serverEnvSchema>

‎packages/internal/src/env.ts‎

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,14 @@
1-
import { clientEnvSchema, clientProcessEnv } from '@codebuff/common/env'
2-
import z from 'zod/v4'
1+
import { clientProcessEnv } from '@codebuff/common/env'
2+
3+
import { serverEnvSchema } from './env-schema'
4+
5+
import type { ServerInput } from './env-schema'
36

47
// Only log environment in non-production
58
if (process.env.NEXT_PUBLIC_CB_ENVIRONMENT !== 'prod') {
69
console.log('Using environment:', process.env.NEXT_PUBLIC_CB_ENVIRONMENT)
710
}
811

9-
export const serverEnvSchema = clientEnvSchema.extend({
10-
// Backend variables
11-
CODEBUFF_API_KEY: z.string().optional(),
12-
OPEN_ROUTER_API_KEY: z.string().min(1),
13-
RELACE_API_KEY: z.string().min(1),
14-
LINKUP_API_KEY: z.string().min(1),
15-
CONTEXT7_API_KEY: z.string().optional(),
16-
GOOGLE_CLOUD_PROJECT_ID: z.string().min(1),
17-
PORT: z.coerce.number().min(1000),
18-
19-
// Web/Database variables
20-
DATABASE_URL: z.string().min(1),
21-
GOOGLE_SITE_VERIFICATION_ID: z.string().optional(),
22-
CODEBUFF_GITHUB_ID: z.string().min(1),
23-
CODEBUFF_GITHUB_SECRET: z.string().min(1),
24-
NEXTAUTH_URL: z.url().optional(),
25-
NEXTAUTH_SECRET: z.string().min(1),
26-
STRIPE_SECRET_KEY: z.string().min(1),
27-
STRIPE_WEBHOOK_SECRET_KEY: z.string().min(1),
28-
STRIPE_USAGE_PRICE_ID: z.string().min(1),
29-
STRIPE_TEAM_FEE_PRICE_ID: z.string().min(1),
30-
LOOPS_API_KEY: z.string().min(1),
31-
DISCORD_PUBLIC_KEY: z.string().min(1),
32-
DISCORD_BOT_TOKEN: z.string().min(1),
33-
DISCORD_APPLICATION_ID: z.string().min(1),
34-
35-
// Common variables
36-
API_KEY_ENCRYPTION_SECRET: z.string().length(32),
37-
})
38-
export const serverEnvVars = serverEnvSchema.keyof().options
39-
export type ServerEnvVar = (typeof serverEnvVars)[number]
40-
export type ServerInput = {
41-
[K in (typeof serverEnvVars)[number]]: string | undefined
42-
}
43-
export type ServerEnv = z.infer<typeof serverEnvSchema>
44-
4512
// Bun will inject all these values, so we need to reference them individually (no for-loops)
4613
const serverProcessEnv: ServerInput = {
4714
...clientProcessEnv,
@@ -75,6 +42,4 @@ const serverProcessEnv: ServerInput = {
7542
API_KEY_ENCRYPTION_SECRET: process.env.API_KEY_ENCRYPTION_SECRET,
7643
}
7744

78-
console.error({ serverProcessEnv }, 'asdf')
79-
8045
export const env = serverEnvSchema.parse(serverProcessEnv)

‎scripts/generate-ci-env.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import path from 'path'
88
import { fileURLToPath } from 'url'
99

10-
import { CLIENT_ENV_PREFIX, clientEnvSchema } from '@codebuff/common/env'
11-
import { serverEnvSchema } from '@codebuff/internal/env'
10+
import { CLIENT_ENV_PREFIX, clientEnvSchema } from '@codebuff/common/env-schema'
11+
import { serverEnvSchema } from '@codebuff/internal/env-schema'
1212

1313
const __filename = fileURLToPath(import.meta.url)
1414
const __dirname = path.dirname(__filename)

0 commit comments

Comments
 (0)