Added string detection in isPromise()

nuxy · Mar 28, 2023 · dc8225b · dc8225b
1 parent bf6dc45
commit dc8225b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/router/Common.js b/src/router/Common.js
@@ -28,19 +28,26 @@ exports.isAsyncFunc = function(value) {
 };
 
 /**
- * Check if object is Promise.
+ * Check if object is (or returns) Promise.
  *
  * @param {Object} obj
  *   Promise object.
  *
  * @return {Boolean}
  *
  * @example
- * const result = isPromise(new Promise(() => {}));
+ * const promise = new Promise(() => {});
+
+ * const result = isPromise(promise);
+ * // true
+ *
+ * const result = function() {
+ *   return promise;
+ * };
  * // true
  */
 exports.isPromise = function(obj) {
-  return (obj && (obj[Symbol.toStringTag] === 'Promise' || typeof obj.then === 'function'));
+  return (obj && (obj[Symbol.toStringTag] === 'Promise' || typeof obj.then === 'function' || /new Promise/.test(obj.toString())));
 };
 
 /**

diff --git a/test/unit/Common.js b/test/unit/Common.js
@@ -29,6 +29,9 @@ describe('Common module', function() {
       const result1 = Common.isPromise(new Promise(() => {}));
       const result2 = Common.isPromise(new Object());
       const result3 = Common.isPromise(new Function());
+      const result4 = Common.isPromise(function() {
+        return new Promise(() => {});
+      });
 
       it('should return value', function() {
         expect(result1).to.be.true;