fix(core): take output.indexFiles setting into account (#1770)

* fix(core): take output.indexFiles setting into account * fix: move workspace from fetch to default * fix: refactor * fix: remove unused imports * fix: headers
orval-labs · Jan 7, 2025 · 074936a · 074936a
1 parent 743a71f
commit 074936a
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 52 deletions.
diff --git a/packages/core/src/writers/generate-imports-for-builder.ts b/packages/core/src/writers/generate-imports-for-builder.ts
@@ -0,0 +1,15 @@
+import uniqBy from 'lodash.uniqby';
+import { GeneratorImport, NormalizedOutputOptions } from '../types';
+import { upath, camel } from '../utils';
+
+export const generateImportsForBuilder = (
+  output: NormalizedOutputOptions,
+  imports: GeneratorImport[],
+  relativeSchemasPath: string,
+) =>
+  output.schemas && !output.indexFiles
+    ? uniqBy(imports, 'name').map((i) => ({
+        exports: [i],
+        dependency: upath.joinSafe(relativeSchemasPath, camel(i.name)),
+      }))
+    : [{ exports: imports, dependency: relativeSchemasPath }];
diff --git a/packages/core/src/writers/single-mode.ts b/packages/core/src/writers/single-mode.ts
@@ -8,6 +8,7 @@ import {
   isSyntheticDefaultImportsAllow,
   upath,
 } from '../utils';
+import { generateImportsForBuilder } from './generate-imports-for-builder';
 import { generateTarget } from './target';
 import { getOrvalGeneratedTypes } from './types';
 
@@ -50,20 +51,20 @@ export const writeSingleMode = async ({
       output.tsconfig,
     );
 
+    const importsForBuilder = schemasPath
+      ? generateImportsForBuilder(
+          output,
+          imports.filter(
+            (imp) => !importsMock.some((impMock) => imp.name === impMock.name),
+          ),
+          schemasPath,
+        )
+      : [];
+
     data += builder.imports({
       client: output.client,
       implementation,
-      imports: schemasPath
-        ? [
-            {
-              exports: imports.filter(
-                (imp) =>
-                  !importsMock.some((impMock) => imp.name === impMock.name),
-              ),
-              dependency: schemasPath,
-            },
-          ]
-        : [],
+      imports: importsForBuilder,
       specsName,
       hasSchemaDir: !!output.schemas,
       isAllowSyntheticDefaultImports,
@@ -77,11 +78,12 @@ export const writeSingleMode = async ({
     });
 
     if (output.mock) {
+      const importsMockForBuilder = schemasPath
+        ? generateImportsForBuilder(output, importsMock, schemasPath)
+        : [];
       data += builder.importsMock({
         implementation: implementationMock,
-        imports: schemasPath
-          ? [{ exports: importsMock, dependency: schemasPath }]
-          : [],
+        imports: importsMockForBuilder,
         specsName,
         hasSchemaDir: !!output.schemas,
         isAllowSyntheticDefaultImports,

diff --git a/packages/core/src/writers/split-mode.ts b/packages/core/src/writers/split-mode.ts
@@ -11,6 +11,7 @@ import {
 import { generateTarget } from './target';
 import { getOrvalGeneratedTypes } from './types';
 import { getMockFileExtensionByTypeName } from '../utils/fileExtensions';
+import { generateImportsForBuilder } from './generate-imports-for-builder';
 
 export const writeSplitMode = async ({
   builder,
@@ -52,10 +53,16 @@ export const writeSplitMode = async ({
       output.tsconfig,
     );
 
+    const importsForBuilder = generateImportsForBuilder(
+      output,
+      imports,
+      relativeSchemasPath,
+    );
+
     implementationData += builder.imports({
       client: output.client,
       implementation,
-      imports: [{ exports: imports, dependency: relativeSchemasPath }],
+      imports: importsForBuilder,
       specsName,
       hasSchemaDir: !!output.schemas,
       isAllowSyntheticDefaultImports,
@@ -68,9 +75,15 @@ export const writeSplitMode = async ({
       output,
     });
 
+    const importsMockForBuilder = generateImportsForBuilder(
+      output,
+      importsMock,
+      relativeSchemasPath,
+    );
+
     mockData += builder.importsMock({
       implementation: implementationMock,
-      imports: [{ exports: importsMock, dependency: relativeSchemasPath }],
+      imports: importsMockForBuilder,
       specsName,
       hasSchemaDir: !!output.schemas,
       isAllowSyntheticDefaultImports,

diff --git a/packages/core/src/writers/split-tags-mode.ts b/packages/core/src/writers/split-tags-mode.ts
@@ -1,11 +1,6 @@
 import fs from 'fs-extra';
 import { generateModelsInline, generateMutatorImports } from '../generators';
-import {
-  GeneratorImport,
-  NormalizedOutputOptions,
-  OutputClient,
-  WriteModeProps,
-} from '../types';
+import { OutputClient, WriteModeProps } from '../types';
 import {
   camel,
   getFileInfo,
@@ -16,7 +11,7 @@ import {
 import { generateTargetForTags } from './target-tags';
 import { getOrvalGeneratedTypes } from './types';
 import { getMockFileExtensionByTypeName } from '../utils/fileExtensions';
-import uniqBy from 'lodash.uniqby';
+import { generateImportsForBuilder } from './generate-imports-for-builder';
 
 export const writeSplitTagsMode = async ({
   builder,
@@ -63,7 +58,7 @@ export const writeSplitTagsMode = async ({
             )
           : '../' + filename + '.schemas';
 
-        const importsForBuilder = generateImports(
+        const importsForBuilder = generateImportsForBuilder(
           output,
           imports,
           relativeSchemasPath,
@@ -85,7 +80,7 @@ export const writeSplitTagsMode = async ({
           output,
         });
 
-        const importsMockForBuilder = generateImports(
+        const importsMockForBuilder = generateImportsForBuilder(
           output,
           importsMock,
           relativeSchemasPath,
@@ -192,15 +187,3 @@ export const writeSplitTagsMode = async ({
 
   return generatedFilePathsArray.flatMap((it) => it);
 };
-
-const generateImports = (
-  output: NormalizedOutputOptions,
-  imports: GeneratorImport[],
-  relativeSchemasPath: string,
-) =>
-  output.schemas && !output.indexFiles
-    ? uniqBy(imports, 'name').map((i) => ({
-        exports: [i],
-        dependency: upath.join(relativeSchemasPath, camel(i.name)),
-      }))
-    : [{ exports: imports, dependency: relativeSchemasPath }];
diff --git a/packages/core/src/writers/tags-mode.ts b/packages/core/src/writers/tags-mode.ts
@@ -9,6 +9,7 @@ import {
   kebab,
   upath,
 } from '../utils';
+import { generateImportsForBuilder } from './generate-imports-for-builder';
 import { generateTargetForTags } from './target-tags';
 import { getOrvalGeneratedTypes } from './types';
 
@@ -55,15 +56,13 @@ export const writeTagsMode = async ({
             )
           : './' + filename + '.schemas';
 
-        const importsForBuilder = [
-          {
-            exports: imports.filter(
-              (imp) =>
-                !importsMock.some((impMock) => imp.name === impMock.name),
-            ),
-            dependency: schemasPathRelative,
-          },
-        ];
+        const importsForBuilder = generateImportsForBuilder(
+          output,
+          imports.filter(
+            (imp) => !importsMock.some((impMock) => imp.name === impMock.name),
+          ),
+          schemasPathRelative,
+        );
 
         data += builder.imports({
           client: output.client,
@@ -82,11 +81,15 @@ export const writeTagsMode = async ({
         });
 
         if (output.mock) {
+          const importsMockForBuilder = generateImportsForBuilder(
+            output,
+            importsMock,
+            schemasPathRelative,
+          );
+
           data += builder.importsMock({
             implementation: implementationMock,
-            imports: [
-              { exports: importsMock, dependency: schemasPathRelative },
-            ],
+            imports: importsMockForBuilder,
             specsName,
             hasSchemaDir: !!output.schemas,
             isAllowSyntheticDefaultImports,

diff --git a/packages/fetch/src/index.ts b/packages/fetch/src/index.ts
@@ -154,8 +154,10 @@ ${
   const ignoreContentTypes = ['multipart/form-data'];
   const fetchHeadersOption =
     body.contentType && !ignoreContentTypes.includes(body.contentType)
-      ? `headers: { 'Content-Type': '${body.contentType}', ...options?.headers }`
-      : '';
+      ? `headers: { 'Content-Type': '${body.contentType}',${headers ? '...headers,' : ''} ...options?.headers }`
+      : headers
+        ? 'headers: {...headers, ...options?.headers}'
+        : '';
   const requestBodyParams = generateBodyOptions(
     body,
     isFormData,
@@ -170,7 +172,6 @@ ${
   const fetchFnOptions = `${getUrlFnName}(${getUrlFnProperties}),
   {${globalFetchOptions ? '\n' : ''}      ${globalFetchOptions}
     ${isRequestOptions ? '...options,' : ''}
-    ${headers ? 'headers: { ...headers, ...options?.headers },' : ''}
     ${fetchMethodOption}${fetchHeadersOption ? ',' : ''}
     ${fetchHeadersOption}${fetchBodyOption ? ',' : ''}
     ${fetchBodyOption}

diff --git a/tests/configs/default.config.ts b/tests/configs/default.config.ts
@@ -198,4 +198,15 @@ export default defineConfig({
       mock: true,
     },
   },
+  noIndexFiles: {
+    output: {
+      target: '../generated/default/no-index-files/endpoints.ts',
+      schemas: '../generated/default/no-index-files/model',
+      client: 'fetch',
+      indexFiles: false,
+    },
+    input: {
+      target: '../specifications/petstore.yaml',
+    },
+  },
 });