fix: file symlink path shouldn't end with slash

thecodrr · Aug 25, 2024 · 8e3976b · 8e3976b
1 parent 646e47c
commit 8e3976b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/__tests__/fdir.test.ts b/__tests__/fdir.test.ts
@@ -405,7 +405,7 @@ for (const type of apiTypes) {
 
     const files = await api[type]();
     t.expect(
-      files.indexOf(resolveSymlinkRoot("/some/dir/fileSymlink/")) > -1
+      files.indexOf(resolveSymlinkRoot("/some/dir/fileSymlink")) > -1
     ).toBeTruthy();
 
     mock.restore();

diff --git a/src/api/functions/resolve-symlink.ts b/src/api/functions/resolve-symlink.ts
@@ -7,7 +7,7 @@ export type ResolveSymlinkFunction = (
   callback: (stat: fs.Stats, path: string) => void
 ) => void;
 
-const resolveSymlinksAsync: ResolveSymlinkFunction = function(
+const resolveSymlinksAsync: ResolveSymlinkFunction = function (
   path,
   state,
   callback
@@ -24,12 +24,12 @@ const resolveSymlinksAsync: ResolveSymlinkFunction = function(
       return;
     }
 
-      callback(stat, path);
-      queue.dequeue(null, state);
+    callback(stat, path);
+    queue.dequeue(null, state);
   });
 };
 
-const resolveSymlinksWithRealPathsAsync: ResolveSymlinkFunction = function(
+const resolveSymlinksWithRealPathsAsync: ResolveSymlinkFunction = function (
   path,
   state,
   callback
@@ -54,7 +54,7 @@ const resolveSymlinksWithRealPathsAsync: ResolveSymlinkFunction = function(
   });
 };
 
-const resolveSymlinksSync: ResolveSymlinkFunction = function(
+const resolveSymlinksSync: ResolveSymlinkFunction = function (
   path,
   state,
   callback
@@ -67,7 +67,7 @@ const resolveSymlinksSync: ResolveSymlinkFunction = function(
   }
 };
 
-const resolveSymlinksWithRealPathsSync: ResolveSymlinkFunction = function(
+const resolveSymlinksWithRealPathsSync: ResolveSymlinkFunction = function (
   path,
   state,
   callback
@@ -89,9 +89,7 @@ export function build(
 
   if (options.useRealPaths)
     return isSynchronous
-        ? resolveSymlinksWithRealPathsSync
-        : resolveSymlinksWithRealPathsAsync;
-  return isSynchronous
-    ? resolveSymlinksSync
-    : resolveSymlinksAsync;
+      ? resolveSymlinksWithRealPathsSync
+      : resolveSymlinksWithRealPathsAsync;
+  return isSynchronous ? resolveSymlinksSync : resolveSymlinksAsync;
 }
diff --git a/src/api/walker.ts b/src/api/walker.ts
@@ -117,11 +117,7 @@ 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) {
-        let path = joinPath.joinDirectoryPath(
-          entry.name,
-          directoryPath,
-          this.state.options.pathSeparator
-        );
+        let path = this.joinPath(entry.name, directoryPath);
         this.resolveSymlink!(path, this.state, (stat, resolvedPath) => {
           if (stat.isDirectory()) {
             resolvedPath = this.normalizePath(resolvedPath);