Refactor: address PR feedback for cat and ls tools

Author: zohrehKazemianpour

.gitignore

@@ -1,3 +1,4 @@
+
+prep
 node_modules
-prep/
-node_modules/
+.venv

implement-shell-tools/cat/cat.js

@@ -22,33 +22,29 @@ let lineNumber = 0;
 // Process each file
 for (const path of program.args) {
   const hasNumberFlag = program.opts().number; // True if user used -n flag
-  const hasBFlag = program.opts().numberNonBlank;
+  const shouldNumberNonBlank = program.opts().numberNonBlank;
 
   //read the file for each argument
   const content = await fs.readFile(path, "utf-8");
+  const lines = content.split("\n"); // Split into array of lines
+
   // Output with or without line numbers
   if (hasNumberFlag) {
     // Add line numbers to each line
-    const lines = content.split("\n"); // Split into array of lines
     const numberedLines = lines.map((line) => {
       lineNumber = lineNumber + 1;
       return `${lineNumber} ${line}`; // Format: "     1  Hello"
     });
     console.log(numberedLines.join("\n")); // Join back with newlines
-  } else if (hasBFlag) {
-    const lines = content.split("\n");
+  } else if (shouldNumberNonBlank) {
 
     const numberedLines = lines.map((line) => {
-      if (line.trim() === "") {
-        return line;
-      } else {
-        lineNumber = lineNumber + 1;
-        return ` ${lineNumber} ${line}`;
-      }
+      return line.trim() === "" ? line : `${++lineNumber} ${line}`;
     });
     console.log(numberedLines.join("\n"));
   } else {
     // Just print the file as-is
     console.log(content);
   }
 }
+

implement-shell-tools/ls/ls.js

@@ -24,6 +24,7 @@ const files = await fs.readdir(directory);
 
 //check for flags
 const hasAflag = program.opts().all;
+const hasOneFlag = program.opts().one;
 
 // Filter the files array BEFORE looping
 // If hasAflag is true, keep all files
@@ -34,10 +35,13 @@ const fileToShow = hasAflag
 : files.filter(file => !file.startsWith("."))
 
 
-//print each file on its own line
-// Note: console.log(files) would print the entire array like: ['file1', 'file2']
-// Loop prints each individually on separate lines
+if (hasOneFlag) {
+  
+  for (const file of fileToShow) {
+    console.log(file);
+  }
+} else {
+  // print horizontally 
+  console.log(fileToShow.join("  "));
+}
 
-for (const file of fileToShow) {
-    console.log(file)
-}