fix: support symlinks without real paths with relative paths enabled

__tests__/fdir.test.ts

@@ -328,6 +328,49 @@ for (const type of apiTypes) {
     mock.restore();
   });
 
+  test(`[${type}] crawl all files and include resolved symlinks without real paths with relative paths on`, async (t) => {
+    mock(mockFsWithSymlinks);
+
+    const api = new fdir()
+      .withSymlinks({ resolvePaths: false })
+      .withRelativePaths()
+      .crawl("/some/dir");
+    const files = await api[type]();
+    t.expect(files).toHaveLength(3);
+    t.expect(
+      files.indexOf(path.join("dirSymlink", "file-1")) > -1
+    ).toBeTruthy();
+    t.expect(
+      files.indexOf(path.join("dirSymlink", "file-excluded-1")) > -1
+    ).toBeTruthy();
+    t.expect(
+      files.indexOf("fileSymlink") > -1
+    ).toBeTruthy();
+    mock.restore();
+  });
+
+  // fdir doesn't support this usecase
+  test(`[${type}] crawl all files and include resolved symlinks with real paths with relative paths on`, async (t) => {
+    mock(mockFsWithSymlinks);
+
+    const api = new fdir()
+      .withSymlinks()
+      .withRelativePaths()
+      .crawl("/some/dir");
+    const files = await api[type]();
+    t.expect(files).toHaveLength(3);
+    t.expect(
+      files.indexOf(path.join("d", "file-1")) > -1
+    ).toBeTruthy();
+    t.expect(
+      files.indexOf(path.join("d", "file-excluded-1")) > -1
+    ).toBeTruthy();
+    t.expect(
+      files.indexOf(`${path.sep}file-2`) > -1
+    ).toBeTruthy();
+    mock.restore();
+  });
+
   test("crawl all files and include resolved symlinks with exclusions", async (t) => {
     mock(mockFsWithSymlinks);
     const api = new fdir()

documentation.md

@@ -104,7 +104,7 @@ const crawler = new fdir().withDirs();
 
 ### `withSymlinks({ resolvePaths: boolean })`
 
-Use this to follow all symlinks recursively.
+Use this to follow all symlinks recursively. Not available with relative paths on unless the parameter is set to `false`.
 
 **Parameters:**
 

src/api/functions/join-path.ts

@@ -1,6 +1,6 @@
 import { Options, PathSeparator } from "../../types";
 
-function joinPathWithBasePath(filename: string, directoryPath: string) {
+export function joinPathWithBasePath(filename: string, directoryPath: string) {
   return directoryPath + filename;
 }
 

src/api/walker.ts

@@ -1,4 +1,4 @@
-import { resolve as pathResolve } from "path";
+import { basename, dirname, resolve as pathResolve } from "path";
 import { cleanPath, convertSlashes } from "../utils";
 import { ResultCallback, WalkerState, Options } from "../types";
 import * as joinPath from "./functions/join-path";
@@ -117,14 +117,17 @@ export class Walker<TOutput extends Output> {
         if (exclude && exclude(entry.name, path)) continue;
         this.walkDirectory(this.state, path, depth - 1, this.walk);
       } else if (entry.isSymbolicLink() && resolveSymlinks && !excludeSymlinks) {
-        let path = this.joinPath(entry.name, directoryPath);
+        let path = joinPath.joinPathWithBasePath(entry.name, directoryPath);
         this.resolveSymlink!(path, this.state, (stat, resolvedPath) => {
           if (stat.isDirectory()) {
             resolvedPath = this.normalizePath(resolvedPath);
             if (exclude && exclude(entry.name, resolvedPath)) return;
 
             this.walkDirectory(this.state, resolvedPath, depth - 1, this.walk);
           } else {
+            const filename = basename(resolvedPath);  
+            const directoryPath = this.normalizePath(dirname(resolvedPath));  
+            resolvedPath = this.joinPath(filename, directoryPath);  
             this.pushFile(resolvedPath, files, this.state.counts, filters);
           }
         });