feat(ls): support multiple file paths and improve visibility filtering

Author: jakr-s

implement-shell-tools/ls/ls.js

@@ -5,7 +5,7 @@ program
   .name("ls")
   .description("List directory contents")
   .argument(
-    "[path]",
+    "[paths...]",
     "The file path to process (defaults to current directory)",
   )
   .option("-a", "Include directory entries whose names begin with a dot ('.').")
@@ -14,20 +14,53 @@ program
 program.parse();
 
 try {
+  let filePaths = program.args;
+  if (!filePaths || filePaths.length === 0) {
+    filePaths = ["."];
+  }
+
   const options = program.opts();
-  const [filePathArg] = program.args;
+  const includeHidden = Boolean(options.a);
+  const onePerLine = Boolean(options["1"]);
+
+  const result = { files: [], dirs: {} };
+
+  for (const filePath of filePaths) {
+    const stats = await fs.stat(filePath);
+    if (stats.isFile()) result.files.push(filePath);
+    if (stats.isDirectory()) {
+      result.dirs[filePath] = await fs.readdir(filePath);
+    }
+  }
 
-  const filePath = filePathArg || process.cwd();
-  let files = await fs.readdir(filePath);
+  const filterHidden = (files) => files.filter((file) => !file.startsWith("."));
 
-  if (!options.a) files = files.filter((file) => !file.startsWith("."));
+  const getVisibleEntries = (files) =>
+    includeHidden ? files : filterHidden(files);
 
-  if (options["1"]) {
-    for (const file of files) {
-      console.log(file);
+  const formatEntries = (files) => {
+    if (files.length === 0) return;
+    console.log(files.join(onePerLine ? "\n" : "\t"));
+  };
+
+  result.files = getVisibleEntries(result.files);
+
+  if (filePaths.length === 1) {
+    let entries = [...result.files];
+
+    for (const [dir, contents] of Object.entries(result.dirs)) {
+      const filtered = getVisibleEntries(contents);
+      entries = entries.concat(filtered);
     }
+    formatEntries(entries);
   } else {
-    console.log(...files);
+    formatEntries(result.files);
+
+    for (const [dir, contents] of Object.entries(result.dirs)) {
+      console.log("\n" + dir + ":");
+      const filtered = getVisibleEntries(contents);
+      formatEntries(filtered);
+    }
   }
 } catch (err) {
   console.error(err.message);