Feat(inquirer): Make Choices class iterable + add .some() support

SBoudrias · Apr 25, 2024 · b5428e9 · b5428e9
1 parent 6a18ae8
commit b5428e9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/packages/inquirer/lib/objects/choices.js b/packages/inquirer/lib/objects/choices.js
@@ -47,6 +47,15 @@ export default class Choices {
     });
   }
 
+  [Symbol.iterator]() {
+    const data = this.choices;
+    let index = -1;
+
+    return {
+      next: () => ({ value: data[++index], done: !(index in data) }),
+    };
+  }
+
   /**
    * Get a valid choice from the collection
    * @param  {Number} selector  The selected choice index
@@ -106,6 +115,10 @@ export default class Choices {
     return this.choices.find(func);
   }
 
+  some(func) {
+    return this.choices.some(func);
+  }
+
   push(...args) {
     const objs = args.map((val) => new Choice(val));
     this.choices.push(...objs);

diff --git a/packages/inquirer/lib/prompts/checkbox.js b/packages/inquirer/lib/prompts/checkbox.js
@@ -20,11 +20,11 @@ export default class CheckboxPrompt extends Base {
     }
 
     if (Array.isArray(this.opt.default)) {
-      this.opt.choices.forEach(function (choice) {
-        if (this.opt.default.indexOf(choice.value) >= 0) {
+      for (const choice of this.opt.choices) {
+        if (this.opt.default.includes(choice.value)) {
           choice.checked = true;
         }
-      }, this);
+      }
     }
 
     this.pointer = 0;
@@ -192,8 +192,8 @@ export default class CheckboxPrompt extends Base {
   }
 
   onAllKey() {
-    const shouldBeChecked = Boolean(
-      this.opt.choices.find((choice) => choice.type !== 'separator' && !choice.checked),
+    const shouldBeChecked = this.opt.choices.some(
+      (choice) => choice.type !== 'separator' && !choice.checked,
     );
 
     this.opt.choices.forEach((choice) => {