Strip file extensions on customBaseQueryNode (#19)

Author: msutkowski

src/generate.ts

@@ -12,7 +12,7 @@ import { createQuestionToken, keywordType } from 'oazapfts/lib/codegen/tscodegen
 import { OpenAPIV3 } from 'openapi-types';
 import { generateReactHooks } from './generators/react-hooks';
 import { GenerationOptions, OperationDefinition } from './types';
-import { capitalize, getOperationDefinitions, getV3Doc, isQuery, MESSAGES } from './utils';
+import { capitalize, getOperationDefinitions, getV3Doc, isQuery, MESSAGES, stripFileExtension } from './utils';
 
 const { factory } = ts;
 
@@ -116,7 +116,7 @@ export async function generateApi(
         throw new Error(MESSAGES.FILE_NOT_FOUND);
       }
 
-      customBaseQueryNode = generateImportNode(filePath, {
+      customBaseQueryNode = generateImportNode(stripFileExtension(filePath), {
         [baseQueryFn]: baseQueryFn,
       });
     } else {
@@ -135,7 +135,7 @@ export async function generateApi(
 
       baseQueryFn = 'customBaseQuery';
 
-      customBaseQueryNode = generateImportNode(filePath, {
+      customBaseQueryNode = generateImportNode(stripFileExtension(filePath), {
         default: baseQueryFn,
       });
     }

src/utils/index.ts

@@ -5,3 +5,4 @@ export * from './isQuery';
 export * from './isValidUrl';
 export * from './prettier';
 export * from './messages';
+export * from './stripFileExtension';

src/utils/stripFileExtension.ts

@@ -0,0 +1 @@
+export const stripFileExtension = (path: string) => path.replace(/\.(ts|js)$/, '');

test/cli.test.ts

@@ -110,7 +110,7 @@ describe('CLI options testing', () => {
     );
 
     expect(result.stdout).not.toContain('fetchBaseQuery');
-    expect(result.stdout).toContain(`import { anotherNamedBaseQuery } from \"test/fixtures/customBaseQuery.ts\"`);
+    expect(result.stdout).toContain(`import { anotherNamedBaseQuery } from \"test/fixtures/customBaseQuery\"`);
 
     const expectedErrors = [MESSAGES.NAMED_EXPORT_MISSING];
 
@@ -125,7 +125,7 @@ describe('CLI options testing', () => {
     );
 
     expect(result.stdout).not.toContain('fetchBaseQuery');
-    expect(result.stdout).toContain(`import { default as customBaseQuery } from \"test/fixtures/customBaseQuery.ts\"`);
+    expect(result.stdout).toContain(`import { default as customBaseQuery } from \"test/fixtures/customBaseQuery\"`);
 
     const expectedErrors = [MESSAGES.NAMED_EXPORT_MISSING];
 

test/utils.test.ts

@@ -0,0 +1,24 @@
+import { stripFileExtension } from '../src/utils';
+
+describe('stripFileExtension', () => {
+  it('should strip js and ts file extensions from possible input paths', async () => {
+    const testFileInputs = [
+      './whatever/output.ts',
+      './whatever/output.js',
+      'whatever/output.ts',
+      './whatever.ts/output.ts',
+      './no/file/name',
+      '../hello.ts',
+      'banana.js',
+      'banana',
+      './banana',
+    ];
+
+    for (const path of testFileInputs) {
+      const stripped = stripFileExtension(path);
+      const hasExt = stripped.endsWith('.js') || stripped.endsWith('.ts');
+
+      expect(hasExt).toBeFalsy();
+    }
+  });
+});