mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-30 04:01:58 +00:00
SDK beta.62: fix dynamicSelect crash on empty values, add smtpShape
- Guard z.union() against empty arrays in dynamicSelect/dynamicMultiselect by falling back to z.string() (fixes zod v4 _zod TypeError) - Add smtpShape: typed zod schema for store file models, replacing smtpInputSpec.validator which caused cross-zod-instance errors - Bump version to 0.4.0-beta.62 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -15,6 +15,21 @@ import { _, once } from '../../../util'
|
||||
import { z } from 'zod'
|
||||
import { DeepPartial } from '../../../types'
|
||||
|
||||
/** Build a union-of-literals validator from object keys, falling back to z.string() when empty */
|
||||
function literalKeysValidator(
|
||||
values: Record<string, unknown>,
|
||||
): z.ZodType<string> {
|
||||
const keys = Object.keys(values)
|
||||
if (keys.length === 0) return z.string()
|
||||
return z.union(
|
||||
keys.map((x) => z.literal(x)) as [
|
||||
z.ZodLiteral<string>,
|
||||
z.ZodLiteral<string>,
|
||||
...z.ZodLiteral<string>[],
|
||||
],
|
||||
)
|
||||
}
|
||||
|
||||
/** Zod schema for a file upload result — validates `{ path, commitment: { hash, size } }`. */
|
||||
export const fileInfoParser = z.object({
|
||||
path: z.string(),
|
||||
@@ -774,13 +789,7 @@ export class Value<
|
||||
*/
|
||||
immutable?: boolean
|
||||
}) {
|
||||
const validator = z.union(
|
||||
Object.keys(a.values).map((x: keyof Values & string) => z.literal(x)) as [
|
||||
z.ZodLiteral<string>,
|
||||
z.ZodLiteral<string>,
|
||||
...z.ZodLiteral<string>[],
|
||||
],
|
||||
)
|
||||
const validator = literalKeysValidator(a.values)
|
||||
return new Value<keyof Values & string>(
|
||||
() => ({
|
||||
spec: {
|
||||
@@ -825,15 +834,7 @@ export class Value<
|
||||
immutable: false,
|
||||
...a,
|
||||
},
|
||||
validator: z.union(
|
||||
Object.keys(a.values).map((x: keyof Values & string) =>
|
||||
z.literal(x),
|
||||
) as [
|
||||
z.ZodLiteral<string>,
|
||||
z.ZodLiteral<string>,
|
||||
...z.ZodLiteral<string>[],
|
||||
],
|
||||
),
|
||||
validator: literalKeysValidator(a.values),
|
||||
}
|
||||
},
|
||||
z.string(),
|
||||
@@ -891,15 +892,7 @@ export class Value<
|
||||
*/
|
||||
immutable?: boolean
|
||||
}) {
|
||||
const validator = z.array(
|
||||
z.union(
|
||||
Object.keys(a.values).map((x) => z.literal(x)) as [
|
||||
z.ZodLiteral<string>,
|
||||
z.ZodLiteral<string>,
|
||||
...z.ZodLiteral<string>[],
|
||||
],
|
||||
),
|
||||
)
|
||||
const validator = z.array(literalKeysValidator(a.values))
|
||||
return new Value<(keyof Values & string)[]>(
|
||||
() => ({
|
||||
spec: {
|
||||
@@ -953,15 +946,7 @@ export class Value<
|
||||
immutable: false,
|
||||
...a,
|
||||
},
|
||||
validator: z.array(
|
||||
z.union(
|
||||
Object.keys(a.values).map((x) => z.literal(x)) as [
|
||||
z.ZodLiteral<string>,
|
||||
z.ZodLiteral<string>,
|
||||
...z.ZodLiteral<string>[],
|
||||
],
|
||||
),
|
||||
),
|
||||
validator: z.array(literalKeysValidator(a.values)),
|
||||
}
|
||||
}, z.array(z.string()))
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import { GetSystemSmtp, Patterns } from '../../util'
|
||||
import { InputSpec } from './builder/inputSpec'
|
||||
import { Value } from './builder/value'
|
||||
import { Variants } from './builder/variants'
|
||||
import { z } from 'zod'
|
||||
|
||||
const securityVariants = Variants.of({
|
||||
tls: {
|
||||
@@ -182,3 +183,87 @@ export const smtpInputSpec = Value.dynamicUnion(async ({ effects }) => {
|
||||
variants: smtpVariants,
|
||||
}
|
||||
}, smtpVariants.validator)
|
||||
|
||||
const securityShape = z
|
||||
.object({
|
||||
selection: z.enum(['tls', 'starttls']).catch('tls'),
|
||||
value: z.object({ port: z.string().catch('465') }).catch({ port: '465' }),
|
||||
})
|
||||
.catch({ selection: 'tls' as const, value: { port: '465' } })
|
||||
|
||||
const providerShape = z
|
||||
.object({
|
||||
selection: z.string().catch('other'),
|
||||
value: z
|
||||
.object({
|
||||
host: z.string().catch(''),
|
||||
from: z.string().catch(''),
|
||||
username: z.string().catch(''),
|
||||
password: z.string().nullable().optional().catch(null),
|
||||
security: securityShape,
|
||||
})
|
||||
.catch({
|
||||
host: '',
|
||||
from: '',
|
||||
username: '',
|
||||
password: null,
|
||||
security: securityShape.parse(undefined),
|
||||
}),
|
||||
})
|
||||
.catch({
|
||||
selection: 'other',
|
||||
value: {
|
||||
host: '',
|
||||
from: '',
|
||||
username: '',
|
||||
password: null,
|
||||
security: securityShape.parse(undefined),
|
||||
},
|
||||
})
|
||||
|
||||
export type SmtpSelection =
|
||||
| { selection: 'disabled'; value: Record<string, never> }
|
||||
| { selection: 'system'; value: { customFrom?: string | null } }
|
||||
| {
|
||||
selection: 'custom'
|
||||
value: {
|
||||
provider: {
|
||||
selection: string
|
||||
value: {
|
||||
host: string
|
||||
from: string
|
||||
username: string
|
||||
password?: string | null
|
||||
security: {
|
||||
selection: 'tls' | 'starttls'
|
||||
value: { port: string }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Zod schema for persisting SMTP selection in a store file model.
|
||||
* Use this instead of `smtpInputSpec.validator` to avoid cross-zod-instance issues.
|
||||
*/
|
||||
export const smtpShape: z.ZodCatch<z.ZodType<SmtpSelection>> = z
|
||||
.discriminatedUnion('selection', [
|
||||
z.object({
|
||||
selection: z.literal('disabled'),
|
||||
value: z.object({}).catch({}),
|
||||
}),
|
||||
z.object({
|
||||
selection: z.literal('system'),
|
||||
value: z
|
||||
.object({ customFrom: z.string().nullable().optional().catch(null) })
|
||||
.catch({ customFrom: null }),
|
||||
}),
|
||||
z.object({
|
||||
selection: z.literal('custom'),
|
||||
value: z
|
||||
.object({ provider: providerShape })
|
||||
.catch({ provider: providerShape.parse(undefined) }),
|
||||
}),
|
||||
])
|
||||
.catch({ selection: 'disabled' as const, value: {} })
|
||||
|
||||
Reference in New Issue
Block a user