made corrections to the ls and wc implementation

Author: Priscilla-EM

implement-shell-tools/ls/myls.js

@@ -17,18 +17,25 @@ const directory = program.args[0] || ".";
 try {
   let files = await fs.readdir(directory);
 
-  // if "-a" is used, include hidden files; those that start with "." 
+  // if "-a" is used, include hidden files; those that start with "."
   if (options.a) {
     files = [".", "..", ...files];
   }
 
-  for (const file of files) {
-    // if "-a" is not used, skip hidden files; those that start with "."
-    if (!options.a && file.startsWith(".")) {
-      continue;
-    }
+  // If "-a" is not used, filter hidden files out
+  files = files.filter((file) => options.a || !file.startsWith("."));
+
+  // Sort alphabetically
+  files.sort();
 
-    console.log(file); // print file name; one file per line
+  if (options["1"]) {
+    // Print one file per line
+    for (const file of files) {
+      console.log(file);
+    }
+  } else {
+    // Print all files on a single line, separated by spaces
+    console.log(files.join(" "));
   }
 } catch (error) {
   console.error(`Error reading directory ${directory}:`, error.message);

implement-shell-tools/wc/mywc.js

@@ -23,9 +23,14 @@ if (!options.l && !options.w && !options.c) {
   options.c = true;
 }
 
-const showLines = options.l;
-const showWords = options.w;
-const showBytes = options.c;
+function calculateOutput(lines, words, bytes, label) {
+  let output = "";
+  if (options.l) output += `${lines.toString().padStart(8)}`;
+  if (options.w) output += `${words.toString().padStart(8)}`;
+  if (options.c) output += `${bytes.toString().padStart(8)}`;
+  if (label) output += ` ${label}`;
+  return output;
+}
 
 // To support multiple files and a total
 let totalLines = 0;
@@ -44,25 +49,13 @@ for (const file of files) {
     totalWords += wordCount;
     totalBytes += byteCount;
 
-    let output = "";
-    if (showLines) output += `${lineCount.toString().padStart(8)}`;
-    if (showWords) output += `${wordCount.toString().padStart(8)}`;
-    if (showBytes) output += `${byteCount.toString().padStart(8)}`;
-    output += ` ${file}`;
-
-    console.log(output);
+    console.log(calculateOutput(lineCount, wordCount, byteCount, file));
   } catch (err) {
     console.error(`Error reading file ${file}: ${err.message}`);
   }
 }
 
 // If multiple files were given, show the total
 if (files.length > 1) {
-  let totalOutput = "";
-  if (showLines) totalOutput += `${totalLines.toString().padStart(8)}`;
-  if (showWords) totalOutput += `${totalWords.toString().padStart(8)}`;
-  if (showBytes) totalOutput += `${totalBytes.toString().padStart(8)}`;
-  totalOutput += " total";
-
-  console.log(totalOutput);
+  console.log(calculateOutput(totalLines, totalWords, totalBytes, "total"));
 }