wip

Author: gameroman

scripts/gen-client.ts

@@ -776,8 +776,14 @@ async function processSchema(schema: OpenApiSchema): Promise<void> {
     const fullYamlPath = `${tagsDir}/${tagPath}` as const;
     const yamlStr = await Bun.file(fullYamlPath).text();
     const schema = Bun.YAML.parse(yamlStr);
-    const tagSchema = TagSchemaSchema.parse(schema);
-    const newMethods = processTag(tagSchema, rawApiPath);
+    console.log(`Parsing ${tagPath}`);
+    const tagSchema = TagSchemaSchema.safeParse(schema);
+    if (tagSchema.error) {
+      console.error(`Error while parsing ${tagSchema}`);
+      console.error(z.prettifyError(tagSchema.error));
+      throw tagSchema.error;
+    }
+    const newMethods = processTag(tagSchema.data, rawApiPath);
     methodsCode.push(...newMethods);
   }
 

scripts/gen-schemas.ts

@@ -1,6 +1,7 @@
 import { readdirSync } from "node:fs";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { ZodError } from "zod";
 import { prettifyError } from "zod/mini";
 import { convertToZod, SchemaSchema } from "./shared";
 
@@ -10,15 +11,24 @@ async function processFile(filePath: string) {
   const yamlStr = await Bun.file(normalizedFilePath).text();
   const yamlContent = Bun.YAML.parse(yamlStr);
   const parsedSchema = SchemaSchema.safeParse(yamlContent);
-  console.log(`Parsing ${normalizedFilePath}`);
   if (parsedSchema.error) {
     console.error(`Error while parsing ${normalizedFilePath}`);
     console.error(prettifyError(parsedSchema.error));
     throw parsedSchema.error;
   }
-  const { zodSchema, refs: uniqueRefs } = convertToZod(parsedSchema.data);
+  const { zodSchema, refs } = (() => {
+    try {
+      return convertToZod(parsedSchema.data);
+    } catch (e) {
+      if (e instanceof ZodError) {
+        console.error(`Error while converting ${normalizedFilePath}`);
+        console.error(prettifyError(e));
+      }
+      throw e;
+    }
+  })();
 
-  const refImports = uniqueRefs
+  const refImports = refs
     .toSorted()
     .map((refName) => `import { ${refName} } from "./${refName}";` as const)
     .join("\n");

scripts/shared.ts

@@ -21,8 +21,7 @@ const BaseSchema = z.object({
 });
 
 const StringYamlRef = z
-  .string()
-  .refine((str) => str.endsWith(".yaml"))
+  .templateLiteral([z.string(), ".yaml"])
   .brand("StringYamlRef");
 
 export const SchemaSchemaRef = BaseSchema.extend({