Allow for path filtering + specific schemas

Author: Haff

packages/orval/dist/bin/orval.js

@@ -492,7 +492,9 @@ var importOpenApi = async ({
   workspace
 }) => {
   const specs = await generateInputSpecs({ specs: data, input, workspace });
-  const filteredOperations = input.filters?.schemaDependencyAnalysis ? getFilteredOperations(specs[target], input.filters) : void 0;
+  const hasPathFilters = input.filters?.paths && input.filters.paths.length > 0;
+  const shouldAnalyzeDependencies = input.filters?.schemaDependencyAnalysis ?? hasPathFilters;
+  const filteredOperations = shouldAnalyzeDependencies ? getFilteredOperations(specs[target], input.filters) : void 0;
   const schemas = getApiSchemas({
     input,
     output,
@@ -564,15 +566,16 @@ var getApiSchemas = ({
         output
       };
       let parsedSchemas = spec.openapi ? spec.components?.schemas : getAllSchemas(spec, specKey);
-      if (input.filters?.schemaDependencyAnalysis && filteredOperations) {
+      if (filteredOperations && filteredOperations.length > 0) {
         const specFilteredOperations = filteredOperations.filter(
           (op) => op.path.startsWith(specKey) || specKey === target
         );
         if (specFilteredOperations.length > 0) {
-          parsedSchemas = (0, import_core3.filterSchemasByDependencies)(
+          const dependencySchemas = (0, import_core3.filterSchemasByDependencies)(
             specFilteredOperations,
             parsedSchemas
           );
+          parsedSchemas = { ...parsedSchemas, ...dependencySchemas };
         }
       }
       const schemaDefinition = (0, import_core3.generateSchemasDefinition)(

packages/orval/dist/index.js

@@ -404,7 +404,9 @@ var importOpenApi = async ({
   workspace
 }) => {
   const specs = await generateInputSpecs({ specs: data, input, workspace });
-  const filteredOperations = input.filters?.schemaDependencyAnalysis ? getFilteredOperations(specs[target], input.filters) : void 0;
+  const hasPathFilters = input.filters?.paths && input.filters.paths.length > 0;
+  const shouldAnalyzeDependencies = input.filters?.schemaDependencyAnalysis ?? hasPathFilters;
+  const filteredOperations = shouldAnalyzeDependencies ? getFilteredOperations(specs[target], input.filters) : void 0;
   const schemas = getApiSchemas({
     input,
     output,
@@ -476,15 +478,16 @@ var getApiSchemas = ({
         output
       };
       let parsedSchemas = spec.openapi ? spec.components?.schemas : getAllSchemas(spec, specKey);
-      if (input.filters?.schemaDependencyAnalysis && filteredOperations) {
+      if (filteredOperations && filteredOperations.length > 0) {
         const specFilteredOperations = filteredOperations.filter(
           (op) => op.path.startsWith(specKey) || specKey === target
         );
         if (specFilteredOperations.length > 0) {
-          parsedSchemas = (0, import_core3.filterSchemasByDependencies)(
+          const dependencySchemas = (0, import_core3.filterSchemasByDependencies)(
             specFilteredOperations,
             parsedSchemas
           );
+          parsedSchemas = { ...parsedSchemas, ...dependencySchemas };
         }
       }
       const schemaDefinition = (0, import_core3.generateSchemasDefinition)(

packages/orval/dist/src/import-open-api.d.ts.map

@@ -40,7 +40,12 @@ export const importOpenApi = async ({
   const specs = await generateInputSpecs({ specs: data, input, workspace });
 
   // Get filtered operations for schema dependency analysis
-  const filteredOperations = input.filters?.schemaDependencyAnalysis
+  // Enable dependency analysis automatically when path filters are used
+  const hasPathFilters = input.filters?.paths && input.filters.paths.length > 0;
+  const shouldAnalyzeDependencies =
+    input.filters?.schemaDependencyAnalysis ?? hasPathFilters;
+
+  const filteredOperations = shouldAnalyzeDependencies
     ? getFilteredOperations(specs[target], input.filters)
     : undefined;
 
@@ -142,16 +147,18 @@ const getApiSchemas = ({
         : getAllSchemas(spec, specKey);
 
       // Apply schema dependency analysis if enabled and we have filtered operations
-      if (input.filters?.schemaDependencyAnalysis && filteredOperations) {
+      if (filteredOperations && filteredOperations.length > 0) {
         const specFilteredOperations = filteredOperations.filter(
           (op) => op.path.startsWith(specKey) || specKey === target,
         );
 
         if (specFilteredOperations.length > 0) {
-          parsedSchemas = filterSchemasByDependencies(
+          const dependencySchemas = filterSchemasByDependencies(
             specFilteredOperations,
             parsedSchemas,
           );
+          // Merge dependency schemas with original schemas to preserve explicit schema filters
+          parsedSchemas = { ...parsedSchemas, ...dependencySchemas };
         }
       }
 

packages/orval/src/import-open-api.ts

@@ -51,8 +51,7 @@ export default defineConfig({
       filters: {
         paths: [
           ['/pets', ['get', 'post']],
-          ['/pets/{petId}
-            ', ['get', 'put']],
+          ['/pets/{petId}', ['get', 'put']],
         ],
       },
     },
@@ -63,12 +62,25 @@ export default defineConfig({
       target: '../specifications/petstore.yaml',
       filters: {
         mode: 'exclude',
-        paths: [
-          ['/pets', ['delete']],
-        ],
+        paths: [['/pets', ['delete']]],
+      },
+    },
+    output:
+      '../generated/default/petstore-filter-paths-methods-exclude/endpoints.ts',
+  },
+  'petstore-filter-paths-schema-dependency': {
+    input: {
+      target: '../specifications/petstore.yaml',
+      filters: {
+        paths: ['/health'],
       },
     },
-    output: '../generated/default/petstore-filter-paths-methods-exclude/endpoints.ts',
+    output: {
+      target:
+        '../generated/default/petstore-filter-paths-schema-dependency/endpoints.ts',
+      schemas:
+        '../generated/default/petstore-filter-paths-schema-dependency/model',
+    },
   },
   'petstore-transfomer': {
     output: {