fix(prompt): fix default value (#48)

c4spar · Jul 15, 2020 · 805f5a1 · 805f5a1
1 parent 6eacfa3
commit 805f5a1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/packages/prompt/lib/generic-prompt.ts b/packages/prompt/lib/generic-prompt.ts
@@ -148,16 +148,16 @@ export abstract class GenericPrompt<T, V, S extends GenericPromptSettings<T, V>>
     }
 
     protected transformValue( value: V ): T | undefined {
-
-        if ( !value && typeof this.settings.default !== 'undefined' ) {
-            return this.settings.default;
-        }
-
         return this.settings.transform ? this.settings.transform( value ) : this.transform( value );
     }
 
     protected async validateValue( value: V ): Promise<boolean> {
 
+        if ( !value && typeof this.settings.default !== 'undefined' ) {
+            this.value = this.settings.default;
+            return true;
+        }
+
         const validation = await ( this.settings.validate ? this.settings.validate( value ) : this.validate( value ) );
 
         if ( validation === false ) {

diff --git a/packages/prompt/test/input_test.ts b/packages/prompt/test/input_test.ts
@@ -11,12 +11,23 @@ Deno.test( 'prompt input: value', async () => {
 
 Deno.test( 'prompt input: validate option', async () => {
     console.log();
-    Input.inject( 'a'.repeat( 9 ) );
+    Input.inject( 'foo' );
     const result: string | undefined = await Input.prompt( {
         message: 'message',
         validate: value => value.length < 10
     } );
-    assertEquals( result, 'a'.repeat( 9 ) );
+    assertEquals( result, 'foo' );
+} );
+
+Deno.test( 'prompt input: default value', async () => {
+    console.log();
+    Input.inject( '' );
+    const result: string | undefined = await Input.prompt( {
+        message: 'message',
+        default: 'default',
+        validate: value => value.length < 10
+    } );
+    assertEquals( result, 'default' );
 } );
 
 Deno.test( 'prompt input: empty value', async () => {