From ba7d507bc916b853ef83cf714e6e0df0da75653e Mon Sep 17 00:00:00 2001 From: MrVauxs Date: Sun, 11 Feb 2024 08:59:22 +0100 Subject: [PATCH] Optimize --- zod/indexes/datatypes.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/zod/indexes/datatypes.ts b/zod/indexes/datatypes.ts index f98a6a6..dc9a97e 100644 --- a/zod/indexes/datatypes.ts +++ b/zod/indexes/datatypes.ts @@ -14,16 +14,13 @@ export const contentDatatype = z ]) .describe("A content datatype's name, as it appears in the JSON data itself."); -// TODO: merge the below once Zod works properly with records and optional properties -const sourceDatatype = z.enum(["source"]); -const metaDatatypeSansSource = z.enum(["license", "sourceGroup"]); -export const metaDatatype = metaDatatypeSansSource - .or(sourceDatatype) +export const metaDatatype = z.enum(["license", "source", "sourceGroup"]) .describe("A metafile datatype's name, as it appears in the JSON data itself."); +const metaDatatypeSansSource = metaDatatype.exclude(["source"]); + export const datatypeSansSource = contentDatatype.or(metaDatatypeSansSource); -// END TODO export const datatype = contentDatatype .or(metaDatatype)