fix: fixed issues

Author: titanism

lib/builder.js

@@ -1,4 +1,4 @@
-const {Buffer} = require('buffer');
+const { Buffer } = require('buffer');
 
 const dialectsHash = {
   base: require('./dialects/base/index.js'),
@@ -53,81 +53,92 @@ Builder.prototype._pushValue = function (value) {
   }
 
   if (typeof value === 'string' || value instanceof Date) {
-    if (this.options.separatedValues) {
-      const placeholder = this._getPlaceholder();
+    return this._handleStringOrDateValue(value);
+  }
 
-      if (this.options.namedValues) {
-        this._values[placeholder] = value;
-      } else {
-        this._values.push(value);
-      }
+  if (Buffer.isBuffer(value)) {
+    return this._handleBufferValue(value);
+  }
 
-      return this._wrapPlaceholder(placeholder);
-    }
+  if (typeof value === 'object' && value !== null) {
+    return this._handleObjectValue(value);
+  }
+
+  throw new Error('Wrong value type "' + typeof value + '"');
+};
 
-    if (value instanceof Date) {
-      value = value.toISOString();
+Builder.prototype._handleStringOrDateValue = function (value) {
+  if (this.options.separatedValues) {
+    const placeholder = this._getPlaceholder();
+
+    if (this.options.namedValues) {
+      this._values[placeholder] = value;
+    } else {
+      this._values.push(value);
     }
 
-    return '\'' + value + '\'';
+    return this._wrapPlaceholder(placeholder);
   }
 
-  if (Buffer.isBuffer(value)) {
-    // Issue #56: Support for Buffers (BLOB/Hex)
-    const hexValue = value.toString('hex');
-    if (this.options.separatedValues) {
-      const placeholder = this._getPlaceholder();
-      if (this.options.namedValues) {
-        this._values[placeholder] = hexValue;
-      } else {
-        this._values.push(hexValue);
-      }
+  if (value instanceof Date) {
+    value = value.toISOString();
+  }
 
-      return this._wrapPlaceholder(placeholder);
+  return "'" + value + "'";
+};
+
+Builder.prototype._handleBufferValue = function (value) {
+  const hexValue = value.toString('hex');
+  if (this.options.separatedValues) {
+    const placeholder = this._getPlaceholder();
+    if (this.options.namedValues) {
+      this._values[placeholder] = hexValue;
+    } else {
+      this._values.push(hexValue);
     }
 
-    return '\'' + hexValue + '\'';
+    return this._wrapPlaceholder(placeholder);
   }
 
-  if (typeof value === 'object' && value !== null) {
-    // Issue #55: Support for BSON ObjectId conversion to String
-    // Issue #57: Support for null Object type
-    let stringValue;
+  return "'" + hexValue + "'";
+};
 
-    // Handle null objects (objects that are explicitly null-like) first
-    if (Object.keys(value).length === 0) {
-      return 'null';
-    }
+Builder.prototype._handleObjectValue = function (value) {
+  // Issue #55: Support for BSON ObjectId conversion to String
+  // Issue #57: Support for null Object type
+  let stringValue;
 
-    // Check for BSON ObjectId (has toHexString method)
-    if (typeof value.toHexString === 'function') {
-      stringValue = value.toHexString();
-    } else if (
-      value.constructor !== Object
-      && typeof value.toString === 'function'
-    ) {
-      // Check for objects with toString that aren't plain objects
-      stringValue = value.toString();
-    } else {
-      // Still throw error for plain objects that can't be converted
-      throw new Error('Wrong value type "' + typeof value + '"');
-    }
+  // Handle null objects (objects that are explicitly null-like) first
+  if (Object.keys(value).length === 0) {
+    return 'null';
+  }
 
-    if (this.options.separatedValues) {
-      const placeholder = this._getPlaceholder();
-      if (this.options.namedValues) {
-        this._values[placeholder] = stringValue;
-      } else {
-        this._values.push(stringValue);
-      }
+  // Check for BSON ObjectId (has toHexString method)
+  if (typeof value.toHexString === 'function') {
+    stringValue = value.toHexString();
+  } else if (
+    value.constructor !== Object &&
+    typeof value.toString === 'function'
+  ) {
+    // Check for objects with toString that aren't plain objects
+    stringValue = value.toString();
+  } else {
+    // Still throw error for plain objects that can't be converted
+    throw new Error('Wrong value type "' + typeof value + '"');
+  }
 
-      return this._wrapPlaceholder(placeholder);
+  if (this.options.separatedValues) {
+    const placeholder = this._getPlaceholder();
+    if (this.options.namedValues) {
+      this._values[placeholder] = stringValue;
+    } else {
+      this._values.push(stringValue);
     }
 
-    return '\'' + stringValue + '\'';
+    return this._wrapPlaceholder(placeholder);
   }
 
-  throw new Error('Wrong value type "' + typeof value + '"');
+  return "'" + stringValue + "'";
 };
 
 Builder.prototype.configure = function (options) {
@@ -143,7 +154,7 @@ Builder.prototype.configure = function (options) {
 
   if (options.namedValues && !options.indexedValues) {
     throw new Error(
-      'namedValues option can not be used without indexedValues option',
+      'namedValues option can not be used without indexedValues option'
     );
   }