fix node v6 warnings on jsdoc error

jsdoc2md · Sep 20, 2016 · 8240ddf · 8240ddf
1 parent 9270c37
commit 8240ddf
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 11 deletions.
diff --git a/es5/jsdoc-command.js b/es5/jsdoc-command.js
@@ -8,6 +8,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 var arrayify = require('array-back');
 var path = require('path');
+var promiseFinally = require('promise.prototype.finally');
+promiseFinally.shim();
 
 var JsdocCommand = function () {
   function JsdocCommand(options, cache) {
@@ -42,14 +44,17 @@ var JsdocCommand = function () {
       var err = this.validate();
       this.output = this.getOutput(err);
       if (this.output instanceof Promise) {
-        var promiseFinally = require('promise.prototype.finally');
-        promiseFinally(this.output).then(function () {
-          _this.postExecute();
+        return this.output.then(function (result) {
+          return result;
+        }).catch(function (err) {
+          throw err;
+        }).finally(function () {
+          return _this.postExecute();
         });
       } else {
         this.postExecute();
+        return this.output;
       }
-      return this.output;
     }
   }, {
     key: 'preExecute',

diff --git a/es5/temp-file.js b/es5/temp-file.js
@@ -18,7 +18,9 @@ var TempFile = function () {
   _createClass(TempFile, [{
     key: 'delete',
     value: function _delete() {
-      fs.unlinkSync(this.path);
+      try {
+        fs.unlinkSync(this.path);
+      } catch (err) {}
     }
   }]);
 

diff --git a/lib/jsdoc-command.js b/lib/jsdoc-command.js
@@ -1,6 +1,8 @@
 'use strict'
 const arrayify = require('array-back')
 const path = require('path')
+const promiseFinally = require('promise.prototype.finally')
+promiseFinally.shim()
 
 /**
  * @module jsdoc-command
@@ -49,14 +51,18 @@ class JsdocCommand {
     const err = this.validate()
     this.output = this.getOutput(err)
     if (this.output instanceof Promise) {
-      const promiseFinally = require('promise.prototype.finally')
-      promiseFinally(this.output).then(() => {
-        this.postExecute()
-      })
+      return this.output
+        .then(result => {
+          return result
+        })
+        .catch(err => {
+          throw err
+        })
+        .finally(() => this.postExecute())
     } else {
       this.postExecute()
+      return this.output
     }
-    return this.output
   }
 
   /**

diff --git a/lib/temp-file.js b/lib/temp-file.js
@@ -8,7 +8,11 @@ class TempFile {
     fs.writeFileSync(this.path, source)
   }
   delete () {
-    fs.unlinkSync(this.path)
+    try {
+      fs.unlinkSync(this.path)
+    } catch (err) {
+      // already deleted
+    }
   }
 }