fix: schema dependency order

Author: maxholman

lib/process-document.ts

@@ -15,6 +15,7 @@ import { registerTypesFromSchema, schemaToType } from './process-schema.js';
 import {
   maybeJsDocDescription,
   schemaIsOrHasReferenceObject,
+  schemaIsOrHasReferenceObjectsExclusively,
 } from './utils.js';
 
 function wordWrap(text: string) {
@@ -138,17 +139,11 @@ export async function processOpenApiDocument(
 
   for (const [schemaName, schemaObject] of Object.entries(
     schema.components?.schemas || {},
-  ).sort(([, a], [, b]) => {
-    if (!schemaIsOrHasReferenceObject(a) && schemaIsOrHasReferenceObject(b)) {
-      return -1;
-    }
-
-    if (schemaIsOrHasReferenceObject(a) && !schemaIsOrHasReferenceObject(b)) {
-      return 1;
-    }
+  )
+    .sort(([, a]) => (schemaIsOrHasReferenceObject(a) ? 1 : 0))
+    .sort(([, a]) => (schemaIsOrHasReferenceObjectsExclusively(a) ? 1 : 0))) {
+    console.log({ schemaObject });
 
-    return 0;
-  })) {
     registerTypesFromSchema(
       typesAndInterfaces,
       typesFile,

lib/utils.ts

@@ -30,6 +30,19 @@ export function schemaIsOrHasReferenceObject(
   );
 }
 
+export function schemaIsOrHasReferenceObjectsExclusively(
+  a: OpenAPIV3_1.ReferenceObject | OpenAPIV3_1.SchemaObject,
+): boolean {
+  return (
+    isReferenceObject(a) ||
+    ('properties' in a &&
+      Object.values(a.properties).every(schemaIsOrHasReferenceObject)) ||
+    ('anyOf' in a && a.anyOf.every(schemaIsOrHasReferenceObject)) ||
+    ('allOf' in a && a.allOf.every(schemaIsOrHasReferenceObject)) ||
+    ('oneOf' in a && a.oneOf.every(schemaIsOrHasReferenceObject))
+  );
+}
+
 export function refToName(ref: string): string {
   const name = ref.split('/').at(-1);
   if (!name) {