Fix #32 by appending ./ to relative imports from the same folder (#38)

Co-authored-by: Matt Sutkowski <[email protected]>
Co-authored-by: Lenz Weber <[email protected]>

Author: 3 people

src/utils/resolveImportPath.ts

@@ -3,5 +3,9 @@ import { stripFileExtension } from './stripFileExtension';
 
 export function resolveImportPath(modulePath: string, containingFile: string) {
   containingFile = path.resolve(containingFile, '..');
-  return stripFileExtension(path.relative(containingFile, modulePath));
+  const strippedFile = stripFileExtension(path.relative(containingFile, modulePath));
+  if (strippedFile.charAt(0) !== '.') {
+    return `./${strippedFile}`;
+  }
+  return strippedFile;
 }

test/cli.test.ts

@@ -12,6 +12,13 @@ function getTmpFileName() {
   return path.resolve(tmpDir, `${++id}.test.generated.ts`);
 }
 
+function copyAndGetTmpFileName(fileToCopyPath: string, newFileName: string): string {
+  newFileName = `${++id}.test.${newFileName}`;
+  const newFilePath = path.resolve(tmpDir, newFileName);
+  fs.copyFileSync(fileToCopyPath, newFilePath, fs.constants.COPYFILE_EXCL);
+  return newFileName;
+}
+
 function cli(args: string[], cwd: string): Promise<{ error: ExecException | null; stdout: string; stderr: string }> {
   return new Promise((resolve) => {
     exec(
@@ -171,6 +178,34 @@ describe('CLI options testing', () => {
     expect(numberOfErrors).toEqual(0);
   });
 
+  it("should import { default as customBaseQuery } from './customBaseQuery' when a local customBaseQuery is provided to --baseQuery", async () => {
+    const localBaseQueryName = copyAndGetTmpFileName('./test/fixtures/customBaseQuery.ts', 'localCustomBaseQuery.ts');
+    const fileName = getTmpFileName();
+    const result = await cli(
+      [
+        '-h',
+        `--baseQuery`,
+        `./test/tmp/${localBaseQueryName}:namedBaseQuery`,
+        '--file',
+        fileName,
+        `./test/fixtures/petstore.json`,
+      ],
+      '.'
+    );
+
+    const output = fs.readFileSync(fileName, { encoding: 'utf-8' });
+
+    const strippedLocalBaseQueryName = path.parse(localBaseQueryName).name;
+
+    expect(output).not.toContain('fetchBaseQuery');
+    expect(output).toContain(`import { namedBaseQuery } from './${strippedLocalBaseQueryName}'`);
+
+    const expectedErrors = [MESSAGES.NAMED_EXPORT_MISSING];
+
+    const numberOfErrors = expectedErrors.filter((msg) => result.stderr.indexOf(msg) > -1).length;
+    expect(numberOfErrors).toEqual(0);
+  });
+
   it('should error out when the specified with path alias is not found', async () => {
     const result = await cli(
       ['-h', `--baseQuery`, `@/hoge/fuga/nonExistantFile`, `./test/fixtures/petstore.json`],