test: cleanup tree outputs

package.json

@@ -48,7 +48,6 @@
   "devDependencies": {
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-conventional": "^11.0.0",
-    "alphanum-sort": "^1.0.2",
     "apr-for-each": "^3.0.3",
     "apr-intercept": "^3.0.4",
     "apr-main": "^4.0.3",

test/__fixtures__/js-nm-individually/yarn.lock

@@ -1126,13 +1126,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alphanum-sort@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "alphanum-sort@npm:1.0.2"
-  checksum: 28bad91719e15959e36a791a3538924e07da356ebe3b5f992e7668e8018cfc417a7ba4a69512771e5ffa306c7e028435c7748546f66f72d4f7b0ad694cf55069
-  languageName: node
-  linkType: hard
-
 "ansi-align@npm:^3.0.0":
   version: 3.0.0
   resolution: "ansi-align@npm:3.0.0"
@@ -8342,7 +8335,6 @@ fsevents@~2.3.1:
     "@commitlint/cli": ^11.0.0
     "@commitlint/config-conventional": ^11.0.0
     "@vercel/nft": ^0.9.5
-    alphanum-sort: ^1.0.2
     apr-find: ^3.0.3
     apr-for-each: ^3.0.3
     apr-intercept: ^3.0.4

test/__fixtures__/js-nm-single/yarn.lock

@@ -1126,13 +1126,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alphanum-sort@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "alphanum-sort@npm:1.0.2"
-  checksum: 28bad91719e15959e36a791a3538924e07da356ebe3b5f992e7668e8018cfc417a7ba4a69512771e5ffa306c7e028435c7748546f66f72d4f7b0ad694cf55069
-  languageName: node
-  linkType: hard
-
 "ansi-align@npm:^3.0.0":
   version: 3.0.0
   resolution: "ansi-align@npm:3.0.0"
@@ -8342,7 +8335,6 @@ fsevents@~2.3.1:
     "@commitlint/cli": ^11.0.0
     "@commitlint/config-conventional": ^11.0.0
     "@vercel/nft": ^0.9.5
-    alphanum-sort: ^1.0.2
     apr-find: ^3.0.3
     apr-for-each: ^3.0.3
     apr-intercept: ^3.0.4

test/__fixtures__/js-pnp-individually/yarn.lock

@@ -1126,13 +1126,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alphanum-sort@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "alphanum-sort@npm:1.0.2"
-  checksum: 28bad91719e15959e36a791a3538924e07da356ebe3b5f992e7668e8018cfc417a7ba4a69512771e5ffa306c7e028435c7748546f66f72d4f7b0ad694cf55069
-  languageName: node
-  linkType: hard
-
 "ansi-align@npm:^3.0.0":
   version: 3.0.0
   resolution: "ansi-align@npm:3.0.0"
@@ -8342,7 +8335,6 @@ fsevents@~2.3.1:
     "@commitlint/cli": ^11.0.0
     "@commitlint/config-conventional": ^11.0.0
     "@vercel/nft": ^0.9.5
-    alphanum-sort: ^1.0.2
     apr-find: ^3.0.3
     apr-for-each: ^3.0.3
     apr-intercept: ^3.0.4

test/__fixtures__/js-pnp-single/yarn.lock

@@ -1126,13 +1126,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alphanum-sort@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "alphanum-sort@npm:1.0.2"
-  checksum: 28bad91719e15959e36a791a3538924e07da356ebe3b5f992e7668e8018cfc417a7ba4a69512771e5ffa306c7e028435c7748546f66f72d4f7b0ad694cf55069
-  languageName: node
-  linkType: hard
-
 "ansi-align@npm:^3.0.0":
   version: 3.0.0
   resolution: "ansi-align@npm:3.0.0"
@@ -8342,7 +8335,6 @@ fsevents@~2.3.1:
     "@commitlint/cli": ^11.0.0
     "@commitlint/config-conventional": ^11.0.0
     "@vercel/nft": ^0.9.5
-    alphanum-sort: ^1.0.2
     apr-find: ^3.0.3
     apr-for-each: ^3.0.3
     apr-intercept: ^3.0.4

test/__fixtures__/ts-nm-individually/yarn.lock

@@ -1168,13 +1168,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alphanum-sort@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "alphanum-sort@npm:1.0.2"
-  checksum: 28bad91719e15959e36a791a3538924e07da356ebe3b5f992e7668e8018cfc417a7ba4a69512771e5ffa306c7e028435c7748546f66f72d4f7b0ad694cf55069
-  languageName: node
-  linkType: hard
-
 "ansi-align@npm:^3.0.0":
   version: 3.0.0
   resolution: "ansi-align@npm:3.0.0"
@@ -8594,7 +8587,6 @@ fsevents@~2.3.1:
     "@commitlint/cli": ^11.0.0
     "@commitlint/config-conventional": ^11.0.0
     "@vercel/nft": ^0.9.5
-    alphanum-sort: ^1.0.2
     apr-find: ^3.0.3
     apr-for-each: ^3.0.3
     apr-intercept: ^3.0.4

test/__fixtures__/ts-nm-single/yarn.lock

@@ -1168,13 +1168,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alphanum-sort@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "alphanum-sort@npm:1.0.2"
-  checksum: 28bad91719e15959e36a791a3538924e07da356ebe3b5f992e7668e8018cfc417a7ba4a69512771e5ffa306c7e028435c7748546f66f72d4f7b0ad694cf55069
-  languageName: node
-  linkType: hard
-
 "ansi-align@npm:^3.0.0":
   version: 3.0.0
   resolution: "ansi-align@npm:3.0.0"
@@ -8594,7 +8587,6 @@ fsevents@~2.3.1:
     "@commitlint/cli": ^11.0.0
     "@commitlint/config-conventional": ^11.0.0
     "@vercel/nft": ^0.9.5
-    alphanum-sort: ^1.0.2
     apr-find: ^3.0.3
     apr-for-each: ^3.0.3
     apr-intercept: ^3.0.4

test/__fixtures__/ts-pnp-individually/yarn.lock

@@ -1168,13 +1168,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alphanum-sort@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "alphanum-sort@npm:1.0.2"
-  checksum: 28bad91719e15959e36a791a3538924e07da356ebe3b5f992e7668e8018cfc417a7ba4a69512771e5ffa306c7e028435c7748546f66f72d4f7b0ad694cf55069
-  languageName: node
-  linkType: hard
-
 "ansi-align@npm:^3.0.0":
   version: 3.0.0
   resolution: "ansi-align@npm:3.0.0"
@@ -8594,7 +8587,6 @@ fsevents@~2.3.1:
     "@commitlint/cli": ^11.0.0
     "@commitlint/config-conventional": ^11.0.0
     "@vercel/nft": ^0.9.5
-    alphanum-sort: ^1.0.2
     apr-find: ^3.0.3
     apr-for-each: ^3.0.3
     apr-intercept: ^3.0.4

test/__fixtures__/ts-pnp-single/yarn.lock

@@ -1168,13 +1168,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alphanum-sort@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "alphanum-sort@npm:1.0.2"
-  checksum: 28bad91719e15959e36a791a3538924e07da356ebe3b5f992e7668e8018cfc417a7ba4a69512771e5ffa306c7e028435c7748546f66f72d4f7b0ad694cf55069
-  languageName: node
-  linkType: hard
-
 "ansi-align@npm:^3.0.0":
   version: 3.0.0
   resolution: "ansi-align@npm:3.0.0"
@@ -8594,7 +8587,6 @@ fsevents@~2.3.1:
     "@commitlint/cli": ^11.0.0
     "@commitlint/config-conventional": ^11.0.0
     "@vercel/nft": ^0.9.5
-    alphanum-sort: ^1.0.2
     apr-find: ^3.0.3
     apr-for-each: ^3.0.3
     apr-intercept: ^3.0.4

test/index.js

@@ -10,7 +10,6 @@ const PathIsInside = require('path-is-inside');
 const { isSymlinkSync } = require('path-type');
 const Reduce = require('apr-reduce');
 const SortBy = require('lodash.sortby');
-const Sort = require('alphanum-sort');
 const Uniq = require('lodash.uniq');
 const Setup = require('./setup');
 
@@ -29,18 +28,16 @@ const EVENT = {
 };
 
 const serializeTree = (children = []) => {
-  return Sort(
-    Uniq(
-      children.map(({ type, pathname, source }) => {
-        const link = source ? `-> ${source}` : '';
-        return `${type} ${pathname}${link}`;
-      }),
-    ),
+  return Uniq(
+    children.map(({ type, pathname, source }) => {
+      const link = source ? `-> ${source}` : '';
+      return `${type} ${pathname}${link}`;
+    }),
   );
 };
 
 const normalizeTree = ({ path: fullpath, type, children = [] }, root) => {
-  const pathname = relative(__dirname, fullpath);
+  const pathname = relative(root, fullpath);
   const realpath = realpathSync(fullpath);
   const isDiff = realpath !== fullpath;
   const isInside = PathIsInside(realpath, root);
@@ -67,18 +64,19 @@ const normalizeTree = ({ path: fullpath, type, children = [] }, root) => {
     : realpath;
 
   const isSymlink = isSymlinkSync(fullpath);
+  const stat = lstatSync(fullpath);
   const source = isSymlink
     ? readlinkSync(fullpath)
     : hasSymlink && fullpath !== target
-    ? relative(fullpath, target)
+    ? relative(stat.isDirectory() ? fullpath : dirname(fullpath), target)
     : null;
 
   return SortBy(
     Flatten(
       children
         .map((child) => normalizeTree(child, root))
-        .concat({ type, pathname, source }),
-    ),
+        .concat([{ type, pathname, source }]),
+    ).filter(({ pathname }) => pathname),
     'pathname',
   );
 };