aveazul 1.0.1 → 1.0.2

package/lib/promisify-all.js

@@ -4,16 +4,14 @@ const { promisify } = require("./promisify");
 const {
   isIdentifier,
   isClass,
-  isConstructor,
   isPromisified,
-  getObjectKeys,
-  isExcludedPrototype,
+  getObjectDataKeys,
 } = require("./util");
 
 const defaultSuffix = "Async";
 
 const defaultFilter = function (name) {
-  return isIdentifier(name) && name.charAt(0) !== "_" && name !== "constructor";
+  return isIdentifier(name) && name.charAt(0) !== "_" && name !== "constructor" && !name.endsWith("Sync");
 };
 
 const defaultPromisifier = (fn, _defaultPromisifier, options) => {
@@ -23,33 +21,9 @@ const defaultPromisifier = (fn, _defaultPromisifier, options) => {
   });
 };
 
-const excludedClasses = [Array, Object, Function];
-
-// Helper function to determine if a class extends from any excluded class
-function isExcludedClass(obj) {
-  if (excludedClasses.includes(obj)) {
-    return true;
-  }
-
-  // Check if obj extends from any excluded class using instanceof
-  if (typeof obj === "function" && obj.prototype) {
-    // Check if prototype is instance of any excluded class
-    for (const excludedClass of excludedClasses) {
-      if (obj.prototype instanceof excludedClass) {
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
 
 function promisifyAll2(obj, options) {
-  if (isExcludedClass(obj)) {
-    return;
-  }
-
-  const allKeys = getObjectKeys(obj);
+  const allKeys = getObjectDataKeys(obj);
 
   for (const key of allKeys) {
     const value = obj[key];
@@ -57,7 +31,6 @@ function promisifyAll2(obj, options) {
     const passesDefaultFilter =
       options.filter === defaultFilter ? true : defaultFilter(key, value, obj);
     if (
-      isConstructor(value) ||
       typeof value !== "function" ||
       isPromisified(value) ||
       obj[promisifiedKey] ||
@@ -78,17 +51,14 @@ function promisifyAll2(obj, options) {
     obj[promisifiedKey] = options.promisifier(value, defaultPromisifier, {
       // context: obj, // promisified function should get the binded object using this
       copyProps: false,
-      multiArgs: options.multiArgs,
-      Promise: options.Promise,
+      ...options
     });
   }
 }
 
 function promisifyAll(target, _options) {
   if (typeof target !== "function" && typeof target !== "object") {
-    throw new TypeError(
-      "the target of promisifyAll must be an object or a function"
-    );
+    throw new TypeError("the target of promisifyAll must be an object or a function");
   }
 
   const options = {
@@ -107,21 +77,12 @@ function promisifyAll(target, _options) {
     );
   }
 
-  const allKeys = getObjectKeys(target);
+  const allKeys = getObjectDataKeys(target);
 
   for (const key of allKeys) {
     const value = target[key];
-    if (
-      value &&
-      key !== "constructor" &&
-      !key.startsWith("_") &&
-      isClass(value)
-    ) {
-      const proto = Object.getPrototypeOf(value);
-      if (!isExcludedPrototype(proto)) {
-        promisifyAll2(proto, options);
-      }
-
+    if (value && key !== "constructor" && !key.startsWith("_") && isClass(value)) {
+      promisifyAll2(value.prototype, options);
       promisifyAll2(value, options);
     }
   }

package/lib/util.js

@@ -11,32 +11,25 @@
  */
 const thisAssignmentPattern = /this\s*\.\s*\S+\s*=/;
 function isClass(fn) {
-  try {
-    if (typeof fn === "function") {
-      const keys = Object.getOwnPropertyNames(fn.prototype);
-
-      const fnStr = fn.toString();
-      const es6Class = fnStr.startsWith("class ") || /^class\s+/.test(fnStr);
-      const hasMethods = keys.length > 1;
-      const hasMethodsOtherThanConstructor =
-        keys.length > 0 && !(keys.length === 1 && keys[0] === "constructor");
-      const hasThisAssignmentAndStaticMethods =
-        thisAssignmentPattern.test(fnStr) &&
-        Object.getOwnPropertyNames(fn).length > 0;
-
-      if (
-        es6Class ||
-        hasMethods ||
-        hasMethodsOtherThanConstructor ||
-        hasThisAssignmentAndStaticMethods
-      ) {
-        return true;
-      }
+    try {
+        if (typeof fn === "function") {
+            const keys = Object.getOwnPropertyNames(fn.prototype);
+
+            const hasMethods = keys.length > 1;
+            const hasMethodsOtherThanConstructor = keys.length > 0 &&
+                !(keys.length === 1 && keys[0] === "constructor");
+            const hasThisAssignmentAndStaticMethods =
+                thisAssignmentPattern.test(fn + "") && Object.getOwnPropertyNames (fn).length > 0;
+
+            if (hasMethods || hasMethodsOtherThanConstructor ||
+                hasThisAssignmentAndStaticMethods) {
+                return true;
+            }
+        }
+        return false;
+    } catch (e) {
+        return false;
     }
-    return false;
-  } catch (e) {
-    return false;
-  }
 }
 
 const rident = /^[a-z$_][a-z$_0-9]*$/i;
@@ -44,18 +37,6 @@ function isIdentifier(str) {
   return rident.test(str);
 }
 
-function isConstructor(func) {
-  if (!func) {
-    return false;
-  }
-  const proto = func.prototype;
-  return (
-    !!proto &&
-    !!proto.constructor &&
-    !!proto.constructor.name &&
-    proto.constructor.name === func.name
-  );
-}
 
 /**
  * Prop filtering code copied from bluebird/js/release
@@ -81,11 +62,7 @@ function copyOwnProperties(source, target, filter = propsFilter) {
 
   for (const name of names) {
     if (filter(name)) {
-      Object.defineProperty(
-        target,
-        name,
-        Object.getOwnPropertyDescriptor(source, name)
-      );
+      Object.defineProperty(target, name, Object.getOwnPropertyDescriptor(source, name));
     }
   }
 }
@@ -118,52 +95,66 @@ function isPromise(obj) {
   );
 }
 
-// istanbul ignore next
-const emptyFatArrow = () => {};
-// istanbul ignore next
-const emptyFunction = function () {};
-
-const defaultExcluded = [
-  Object.getPrototypeOf(Array), // Array.prototype
-  Object.getPrototypeOf(Object), // Object.prototype
-  Object.getPrototypeOf(Function), // Function.prototype
-  Object.getPrototypeOf([]),
-  Object.getPrototypeOf({}),
-  Object.getPrototypeOf(emptyFatArrow),
-  Object.getPrototypeOf(emptyFunction),
-];
-
-function isExcludedPrototype(proto) {
-  return defaultExcluded.includes(proto);
-}
-
 /**
  * Gets all property keys from an object and its prototype chain, excluding standard
  * prototypes like Object.prototype, Array.prototype, and Function.prototype
  *
- * @param {Object} target - The target object to get keys from
+ * @param {Object} obj - The target object to get keys from
  * @param {Array} [excludedPrototypes=[]] - An array of prototype objects to exclude keys from
  * @returns {Array<string>} - Array of property keys
  */
-function getObjectKeys(target, excludedPrototypes = []) {
-  const excluded =
-    excludedPrototypes.length > 0 ? excludedPrototypes : defaultExcluded;
-
-  // Get own properties
-  const ownKeys = Object.getOwnPropertyNames(target);
-
-  // Get prototype properties, excluding those from excluded prototypes
-  let protoKeys = [];
-  let currentProto = Object.getPrototypeOf(target);
+function getObjectDataKeys(obj, excludedProtos = []) {
+  const excludedPrototypes = [
+    Array.prototype,
+    Object.prototype,
+    Function.prototype,
+    ...excludedProtos,
+  ];
+
+  const isExcludedProto = function (val) {
+    for (const protoVal of excludedPrototypes) {
+      if (protoVal === val) {
+        return true;
+      }
+    }
+    return false;
+  };
+
+  const ret = [];
+  const visitedKeys = Object.create(null);
+
+  /* copied from bluebird/js/release/util.js and modified */
+  while (obj && !isExcludedProto(obj)) {
+    let keys;
+    try {
+      keys = Object.getOwnPropertyNames(obj);
+    } catch (e) {
+      /* istanbul ignore next */
+      return ret;
+    }
 
-  // Walk up the prototype chain until we hit null or an excluded prototype
-  while (currentProto && !excluded.includes(currentProto)) {
-    protoKeys = [...protoKeys, ...Object.getOwnPropertyNames(currentProto)];
-    currentProto = Object.getPrototypeOf(currentProto);
+    for (const key of keys) {
+      /* istanbul ignore if */
+      if (visitedKeys[key]) {
+        /* istanbul ignore next */
+        continue;
+      }
+      visitedKeys[key] = true;
+      const desc = Object.getOwnPropertyDescriptor(obj, key);
+      /**
+       * When desc.get && desc.set are falsy, it means the property is a data
+       * property that holds an actual value, rather than being computed dynamically
+       * through getter/setter functions.
+       */
+      /* istanbul ignore next */
+      if (desc && !desc.get && !desc.set) {
+        ret.push(key);
+      }
+    }
+    obj = Object.getPrototypeOf(obj);
   }
 
-  // Combine own properties and prototype properties
-  return [...protoKeys, ...ownKeys];
+  return ret;
 }
 
 /**
@@ -191,9 +182,7 @@ function toArray(args) {
       // to detect if too many errors occurred and completion is impossible.
       args = Array.from(args);
     } else {
-      throw new TypeError(
-        "expecting an array or an iterable object but got " + args
-      );
+      throw new TypeError("expecting an array or an iterable object but got " + args);
     }
   }
 
@@ -203,10 +192,8 @@ function toArray(args) {
 module.exports.copyOwnProperties = copyOwnProperties;
 module.exports.isClass = isClass;
 module.exports.isIdentifier = isIdentifier;
-module.exports.isConstructor = isConstructor;
 module.exports.isPromisified = isPromisified;
 module.exports.isPromise = isPromise;
 module.exports.triggerUncaughtException = triggerUncaughtException;
-module.exports.getObjectKeys = getObjectKeys;
-module.exports.isExcludedPrototype = isExcludedPrototype;
+module.exports.getObjectDataKeys = getObjectDataKeys;
 module.exports.toArray = toArray;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aveazul",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Bluebird drop-in replacement built on native Promise",
   "main": "lib/aveazul.js",
   "homepage": "https://github.com/jchip/aveazul",