fix openapi type issues

omermecitoglu · Jun 13, 2024 · e5f88a2 · e5f88a2
1 parent ae1bdf4
commit e5f88a2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 32 deletions.
diff --git a/src/core/resolvers/imported-schema.ts b/src/core/resolvers/imported-schema.ts
@@ -45,7 +45,7 @@ export function resolveSchemas(paths: PathsObject) {
 }
 
 function resolvePropDefinition(definition: SchemaObject) {
-  if (definition.$ref) {
+  if ("$ref" in definition) {
     return [definition.$ref.replace("#/components/schemas/", "")];
   }
   if (definition.type === "array") {

diff --git a/src/core/resolvers/property.ts b/src/core/resolvers/property.ts
@@ -13,7 +13,7 @@ export default function resolveProperties(collection: Record<string, SchemaObjec
       `${propertyName}${isRequired ? "" : "?"}:`,
       `${resolveSchemaWithNull(property)},`,
     ];
-    if (property.readOnly) content.unshift("readonly");
+    if ("readOnly" in property && property.readOnly) content.unshift("readonly");
     return {
       content: content.join(" "),
       description: property.description || "missing description",

diff --git a/src/core/resolvers/schema-definition.ts b/src/core/resolvers/schema-definition.ts
@@ -30,40 +30,32 @@ function resolveTuple(items: SchemaObject | SchemaObject[], length: number) {
 
 export function resolveSchema(definition?: SchemaObject): string {
   if (!definition) return "unknown";
-  if (definition.$ref) {
+  if ("$ref" in definition) {
     return definition.$ref.replace("#/components/schemas/", "");
   }
-  if (definition.type) {
-    switch (definition.type) {
-      case "string": {
-        if (definition.format === "binary") return "File";
-        // TODO: handle definition.format === "date"
-        if (definition.enum) {
-          return definition.enum.map(resolveEnumItem).join(" | ");
-        }
-        return "string";
+  switch (definition.type) {
+    case "string": {
+      if (definition.format === "binary") return "File";
+      // TODO: handle definition.format === "date"
+      if (definition.enum) {
+        return definition.enum.map(resolveEnumItem).join(" | ");
       }
-      case "number": return "number";
-      case "boolean": return "boolean";
-      case "array": {
-        if (definition.items) {
-          if (definition.maxItems && definition.maxItems === definition.minItems) {
-            return resolveTuple(definition.items, definition.maxItems);
-          }
-          if (Array.isArray(definition.items)) {
-            return resolveArray(definition.items, true);
-          }
-          return `${resolveSchema(definition.items)}[]`;
-        }
-        return "unknown[]";
+      return "string";
+    }
+    case "number": return "number";
+    case "boolean": return "boolean";
+    case "array": {
+      if (definition.maxItems && definition.maxItems === definition.minItems) {
+        return resolveTuple(definition.items, definition.maxItems);
       }
-      case "object": {
-        if (definition.properties) {
-          const props = resolveObject(definition.properties, definition.required ?? []);
-          return `{ ${props.join(", ")} }`;
-        }
-        return "unknown";
+      if (Array.isArray(definition.items)) {
+        return resolveArray(definition.items, true);
       }
+      return `${resolveSchema(definition.items)}[]`;
+    }
+    case "object": {
+      const props = resolveObject(definition.properties, definition.required ?? []);
+      return `{ ${props.join(", ")} }`;
     }
   }
   if (definition.oneOf) {
@@ -73,7 +65,7 @@ export function resolveSchema(definition?: SchemaObject): string {
 }
 
 export function resolveSchemaWithNull(definition: SchemaObject) {
-  if (definition.nullable) {
+  if ("nullable" in definition && definition.nullable) {
     return `${resolveSchema(definition)} | null`;
   }
   return resolveSchema(definition);