Merge pull request #20 from LexBorisoff/dev

Merge dev into main
LexBorisoff · Jan 24, 2025 · 6d335c8 · 6d335c8
2 parents f61190c + 788d824
commit 6d335c8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/lib/elements/autocomplete.js b/lib/elements/autocomplete.js
@@ -93,12 +93,7 @@ class AutocompletePrompt extends Prompt {
     if (this.clearFirst && this.input.length > 0) {
       this.reset();
     } else {
-      this.done = this.exited = true;
-      this.aborted = false;
-      this.fire();
-      this.render();
-      this.out.write('\n');
-      this.close();
+      this.abort();
     }
   }
 

diff --git a/lib/elements/number.js b/lib/elements/number.js
@@ -185,10 +185,11 @@ class NumberPrompt extends Prompt {
   render() {
     if (this.closed) return;
     if (!this.firstRender && this.outputError) {
+      this.out.write(cursor.restore);
       this.out.write(
-        cursor.down(lines(this.outputError, this.out.columns) - 1) +
-          clear(this.outputError, this.out.columns),
+        cursor.down(lines(this.outputError, this.out.columns) - 1),
       );
+      this.clear = clear(this.outputError, this.out.columns);
     }
     super.render();
     this.outputError = '';

diff --git a/lib/elements/text.js b/lib/elements/text.js
@@ -187,10 +187,11 @@ class TextPrompt extends Prompt {
   render() {
     if (this.closed) return;
     if (!this.firstRender && this.outputError) {
+      this.out.write(cursor.restore);
       this.out.write(
-        cursor.down(lines(this.outputError, this.out.columns) - 1) +
-          clear(this.outputError, this.out.columns),
+        cursor.down(lines(this.outputError, this.out.columns) - 1),
       );
+      this.clear = clear(this.outputError, this.out.columns);
     }
     super.render();
     this.outputError = '';

diff --git a/src/index.ts b/src/index.ts
@@ -5,6 +5,7 @@ import type {
   BaseConfig,
   BaseReturn,
   MultiSelectReturn,
+  NumberReturn,
   SelectConfig,
   SelectReturn,
   ToggleConfig,
@@ -92,8 +93,20 @@ const prompts = {
   async number<Name extends string = string>(
     config: BaseConfig<Name>,
     options?: Options,
-  ): BaseReturn<Name> {
-    return await $_({ ...config, type: 'number' }, options);
+  ): NumberReturn<Name> {
+    return await $_(
+      {
+        validate(input) {
+          return typeof input === 'number' || 'Enter a valid number';
+        },
+        ...config,
+        type: 'number',
+        format(input) {
+          return Number(input);
+        },
+      },
+      options,
+    );
   },
 
   async list<Name extends string = string>(

diff --git a/src/types.ts b/src/types.ts
@@ -35,6 +35,10 @@ export type MultiSelectReturn<
   [K in Name]: C['value'][] | undefined;
 }>;
 
+export type NumberReturn<Name extends string = string> = Promise<{
+  [K in Name]: number | undefined;
+}>;
+
 /* ~~~ TOGGLE ~~~  */
 export interface ToggleConfig<Name extends string> extends BaseConfig<Name> {
   active?: string;