fix: relative path handling

Author: mshanemc

src/utils/fileSystemHandler.ts

@@ -23,22 +23,23 @@ export const ensureFileExists = async (filePath: string): Promise<void> => {
 };
 
 /**
- * Traverse up a file path and search for the given file name.
+ * Traverse up a file path and search for the given file name.  Always returns an absolute path.
  *
  * @param start File or folder path to start searching from
  * @param fileName File name to search for
  */
 export function searchUp(start: SourcePath, fileName: string): string | undefined {
-  const filePath = path.join(start, fileName);
+  const absoluteStart = path.isAbsolute(start) ? start : path.join(process.cwd(), start);
+  const filePath = path.join(absoluteStart, fileName);
   if (fs.existsSync(filePath)) {
     return filePath;
   }
 
-  const normalizedStart = path.normalize(start);
-  const parent = path.dirname(normalizedStart);
+  const normalizedAbsoluteStart = path.normalize(absoluteStart);
+  const parent = path.dirname(normalizedAbsoluteStart);
 
   // If we're at root, stop (don't try to go up with ..)
-  if (parent === normalizedStart || normalizedStart === path.parse(normalizedStart).root) {
+  if (parent === normalizedAbsoluteStart || normalizedAbsoluteStart === path.parse(normalizedAbsoluteStart).root) {
     return;
   }
 

test/nuts/local/searchUp/searchUp.nut.ts

@@ -66,10 +66,7 @@ describe('searchUp nut test', () => {
       );
       expect(path.isAbsolute(relativeStartPath)).to.be.false;
       const result = searchUp(relativeStartPath, 'target.txt');
-      const expected = path.relative(
-        session.project.dir,
-        path.join(session.project.dir, 'level1', 'level2', 'target.txt')
-      );
+      const expected = path.join(session.project.dir, 'level1', 'level2', 'target.txt');
 
       expect(result).to.equal(expected);
     });
@@ -81,7 +78,7 @@ describe('searchUp nut test', () => {
       );
       expect(path.isAbsolute(relativeStartPath)).to.be.false;
       const result = searchUp(relativeStartPath, '.gitignore');
-      const expected = path.relative(session.project.dir, path.join(session.project.dir, '.gitignore'));
+      const expected = path.join(session.project.dir, '.gitignore');
 
       expect(result).to.equal(expected);
     });
@@ -95,7 +92,7 @@ describe('searchUp nut test', () => {
       const absoluteStartPath = path.resolve(session.project.dir, relativeStartPath);
       fs.writeFileSync(path.join(absoluteStartPath, 'localFile.txt'), 'local content');
       const result = searchUp(relativeStartPath, 'localFile.txt');
-      const expected = path.relative(session.project.dir, path.join(absoluteStartPath, 'localFile.txt'));
+      const expected = path.join(absoluteStartPath, 'localFile.txt');
 
       expect(result).to.equal(expected);
     });
@@ -120,10 +117,7 @@ describe('searchUp nut test', () => {
       const absoluteFilePath = path.resolve(session.project.dir, relativeFilePath);
       fs.writeFileSync(absoluteFilePath, 'content');
       const result = searchUp(relativeFilePath, 'target.txt');
-      const expected = path.relative(
-        session.project.dir,
-        path.join(session.project.dir, 'level1', 'level2', 'target.txt')
-      );
+      const expected = path.join(session.project.dir, 'level1', 'level2', 'target.txt');
 
       expect(result).to.equal(expected);
     });