Preserver order from selectedSchemas

Author: nolannbiron

packages/react-openapi/src/schemas/resolveOpenAPISchemas.test.ts

@@ -21,7 +21,7 @@ describe('#resolveOpenAPISchemas', () => {
         const filesystem = await fetchFilesystem(
             'https://petstore3.swagger.io/api/v3/openapi.json'
         );
-        const resolved = await resolveOpenAPISchemas(filesystem, { schemas: ['Pet'] });
+        const resolved = await resolveOpenAPISchemas(filesystem, { schemas: ['Pet', 'Tag'] });
 
         expect(resolved).toMatchObject({
             schemas: [
@@ -47,6 +47,24 @@ describe('#resolveOpenAPISchemas', () => {
                         },
                     },
                 },
+                {
+                    name: 'Tag',
+                    schema: {
+                        type: 'object',
+                        properties: {
+                            id: {
+                                type: 'integer',
+                                format: 'int64',
+                            },
+                            name: {
+                                type: 'string',
+                            },
+                        },
+                        xml: {
+                            name: 'tag',
+                        },
+                    },
+                },
             ],
         });
     });

packages/react-openapi/src/schemas/resolveOpenAPISchemas.ts

@@ -32,17 +32,26 @@ export async function resolveOpenAPISchemas(
 
     return { schemas };
 }
-
 /**
  * Get OpenAPI components.schemas that are not ignored.
  */
 function getOpenAPIComponents(
     schema: OpenAPIV3.Document | OpenAPIV3_1.Document,
     selectedSchemas: string[]
 ): OpenAPISchema[] {
-    const schemas = schema.components?.schemas ?? {};
-    return Object.entries(schemas)
-        .filter(([key]) => selectedSchemas.includes(key))
-        .filter(([, schema]) => !shouldIgnoreEntity(schema))
-        .map(([key, schema]) => ({ name: key, schema }));
+    const componentsSchemas = schema.components?.schemas ?? {};
+
+    // Preserve the order of the selected schemas
+    return selectedSchemas
+        .map((name) => {
+            const schema = componentsSchemas[name];
+            if (schema && !shouldIgnoreEntity(schema)) {
+                return {
+                    name,
+                    schema,
+                };
+            }
+            return null;
+        })
+        .filter((schema): schema is OpenAPISchema => !!schema);
 }