tkmind/tkmind_go
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix optional recipe schema zod validation (#4900)

Browse Source
This commit is contained in:
Zane
2025-09-30 10:33:37 -07:00
committed by GitHub
parent 29fd4b97aa
commit 4af7e7b821
1 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/desktop/src/recipe/validation.ts
+22 -32
View File
@@ -187,40 +187,30 @@ function openApiSchemaToZod(schema: Record<string, unknown>): z.ZodTypeAny {
shape[propName] = openApiSchemaToZod(propSchema as Record<string, unknown>); shape[propName] = openApiSchemaToZod(propSchema as Record<string, unknown>);
} }
// Make optional properties optional // Make optional properties optional based on required array
if (schema.required && Array.isArray(schema.required)) { const optionalShape: Record<string, z.ZodTypeAny> = {};
const optionalShape: Record<string, z.ZodTypeAny> = {}; const requiredFields =
for (const [propName, zodSchema] of Object.entries(shape)) { schema.required && Array.isArray(schema.required) ? schema.required : [];
if (schema.required.includes(propName)) {
optionalShape[propName] = zodSchema; for (const [propName, zodSchema] of Object.entries(shape)) {
} else { if (requiredFields.includes(propName)) {
optionalShape[propName] = zodSchema.optional(); optionalShape[propName] = zodSchema;
} } else {
optionalShape[propName] = zodSchema.optional();
} }
let objectSchema = z.object(optionalShape);
if (schema.additionalProperties === true) {
return schema.nullable
? objectSchema.passthrough().nullable()
: objectSchema.passthrough();
} else if (schema.additionalProperties === false) {
return schema.nullable ? objectSchema.strict().nullable() : objectSchema.strict();
}
return schema.nullable ? objectSchema.nullable() : objectSchema;
} else {
let objectSchema = z.object(shape);
if (schema.additionalProperties === true) {
return schema.nullable
? objectSchema.passthrough().nullable()
: objectSchema.passthrough();
} else if (schema.additionalProperties === false) {
return schema.nullable ? objectSchema.strict().nullable() : objectSchema.strict();
}
return schema.nullable ? objectSchema.nullable() : objectSchema;
} }
let objectSchema = z.object(optionalShape);
if (schema.additionalProperties === true) {
return schema.nullable
? objectSchema.passthrough().nullable()
: objectSchema.passthrough();
} else if (schema.additionalProperties === false) {
return schema.nullable ? objectSchema.strict().nullable() : objectSchema.strict();
}
return schema.nullable ? objectSchema.nullable() : objectSchema;
} }
return schema.nullable ? z.record(z.any()).nullable() : z.record(z.any()); return schema.nullable ? z.record(z.any()).nullable() : z.record(z.any());