fix: config.output is null

imcuttle · May 31, 2018 · c27f958 · c27f958
1 parent 6ed148d
commit c27f958
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 25 deletions.
diff --git a/packages/edam/src/__tests__/fixture/edam/spec/index.js b/packages/edam/src/__tests__/fixture/edam/spec/index.js
@@ -18,6 +18,12 @@ module.exports = {
     {
       name: 'value',
       type: 'input',
+      validate: (val) => {
+        console.error('validate', val)
+        if (val === 'error') {
+          return 'should be error message here!'
+        }
+      },
       default: () => 'default_val'
     }
   ],

diff --git a/packages/edam/src/__tests__/pull/npm.test.js b/packages/edam/src/__tests__/pull/npm.test.js
@@ -49,22 +49,6 @@ describe('npm', function() {
     // await fileSystenpmm.cleanDir(output)
   })
 
-  it('should npm pull universal package when use `npm` and nocache', async () => {
-    expect(
-      await npmPull(
-        source,
-        constant.DEFAULT_CACHE_DIR,
-        {
-          cacheDir: false,
-          pull: {
-            npmClient: 'npm'
-          }
-        }
-      )
-    ).toBe(output)
-    expect(version()).toBe('1.0.1')
-  })
-
   afterAll(async function () {
     await fileSystem.cleanDir(this.constants.DEFAULT_CACHE_DIR)
   })

diff --git a/packages/edam/src/core/promptProcessor/index.ts b/packages/edam/src/core/promptProcessor/index.ts
@@ -49,10 +49,7 @@ export default async function prompt(
       }
 
       let value
-      const {
-        transformer,
-        validate
-      } = prompt
+      const { transformer, validate } = prompt
       delete prompt.when
       delete prompt.transformer
       delete prompt.validate
@@ -65,9 +62,19 @@ export default async function prompt(
         value = await transformer(value, set, context)
       }
 
-      if (_.isFunction(validate) && !await validate(value, set, context)) {
-        this.logger.warn('validate %s failed, so the value "%s" is ignored.', prompt.name, value)
-        return set
+      if (_.isFunction(validate)) {
+        let message = await validate(value, set, context)
+        if (typeof message === 'string') {
+          value = prompt.default
+          this.logger &&
+            this.logger.warn(
+              'validate %s failed, error message: %s, so the value "%s" fallback to default value.',
+              prompt.name,
+              message,
+              value
+            )
+          return set
+        }
       }
 
       Object.assign(set, {

diff --git a/packages/edam/src/index.ts b/packages/edam/src/index.ts
@@ -144,7 +144,7 @@ export class Edam extends AwaitEventEmitter {
         ...this.constants.DEFAULT_CONTEXT,
         absoluteDir: this.config.output,
         dirName: this.config.output && nps.dirname(this.config.output),
-        baseName: nps.basename(this.config.output)
+        baseName: this.config.output && nps.basename(this.config.output)
       }
 
       if (this.config.storePrompts && this.config.cacheDir) {
@@ -165,7 +165,7 @@ export class Edam extends AwaitEventEmitter {
       }
 
       await this.emit('prompt:before', prompts, context)
-      const promptValues = await this.prompt(prompts, {
+      const promptValues = await this.prompt.call(this, prompts, {
         yes: this.config.yes,
         context,
         promptProcess: this.promptProcess