fix: Prevent unnecessary use of & {} and use NonNullable instead

denosaurs · Sep 3, 2024 · 5359554 · 5359554
1 parent c6f491e
commit 5359554
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/deno.json b/deno.json
@@ -1,6 +1,6 @@
 {
   "name": "@denosaurs/typefetch",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "exports": {
     ".": "./main.ts"
   },

diff --git a/mod.ts b/mod.ts
@@ -42,6 +42,20 @@ export function escapeObjectKey(key: string): string {
   return `"${key}"`;
 }
 
+/**
+ * Prevents narrowing of string literal union to string.
+ */
+function toSafeUnionString(
+  type: string | undefined,
+  _: number,
+  types: (string | undefined)[],
+): string | undefined {
+  if (type === "string" && types.length > 1) {
+    return "NonNullable<string>";
+  }
+  return type;
+}
+
 export function toSchemaType(
   document: OpenAPI.Document,
   schema?:
@@ -95,8 +109,7 @@ export function toSchemaType(
   if (schema.oneOf) {
     return schema.oneOf
       .map((schema) => toSchemaType(document, schema))
-      // Prevents narrowing of string literal union to string
-      .map((type) => type === "string" ? "(string & {})" : type)
+      .map(toSafeUnionString)
       .filter(Boolean)
       .join("|");
   }
@@ -117,8 +130,7 @@ export function toSchemaType(
 
     return schema.anyOf
       .map((schema) => toSchemaType(document, schema))
-      // Prevents narrowing of string literal union to string
-      .map((type) => type === "string" ? "(string & {})" : type)
+      .map(toSafeUnionString)
       .filter(Boolean)
       .join("|");
   }