knex 2.3.0 → 2.4.1

package/lib/util/is.js

@@ -1,32 +1,32 @@
-function isString(value) {
-  return typeof value === 'string';
-}
-
-function isNumber(value) {
-  return typeof value === 'number';
-}
-
-function isBoolean(value) {
-  return typeof value === 'boolean';
-}
-
-function isUndefined(value) {
-  return typeof value === 'undefined';
-}
-
-function isObject(value) {
-  return typeof value === 'object' && value !== null;
-}
-
-function isFunction(value) {
-  return typeof value === 'function';
-}
-
-module.exports = {
-  isString,
-  isNumber,
-  isBoolean,
-  isUndefined,
-  isObject,
-  isFunction,
-};
+function isString(value) {
+  return typeof value === 'string';
+}
+
+function isNumber(value) {
+  return typeof value === 'number';
+}
+
+function isBoolean(value) {
+  return typeof value === 'boolean';
+}
+
+function isUndefined(value) {
+  return typeof value === 'undefined';
+}
+
+function isObject(value) {
+  return typeof value === 'object' && value !== null;
+}
+
+function isFunction(value) {
+  return typeof value === 'function';
+}
+
+module.exports = {
+  isString,
+  isNumber,
+  isBoolean,
+  isUndefined,
+  isObject,
+  isFunction,
+};

package/lib/util/nanoid.js

@@ -1,40 +1,40 @@
-// This alphabet uses `A-Za-z0-9_-` symbols. The genetic algorithm helped
-// optimize the gzip compression for this alphabet.
-const urlAlphabet =
-  'ModuleSymbhasOwnPr-0123456789ABCDEFGHNRVfgctiUvz_KqYTJkLxpZXIjQW';
-
-const numberAlphabet = '0123456789';
-
-/**
- * Generate URL-friendly unique ID. This method uses the non-secure
- * predictable random generator with bigger collision probability.
- * Based on https://github.com/ai/nanoid
- *
- * ```js
- * model.id = nanoid() //=> "Uakgb_J5m9g-0JDMbcJqL"
- * ```
- *
- * @param size Size of the ID. The default size is 21.
- * @returns A random string.
- */
-function nanoid(size = 21) {
-  let id = '';
-  // A compact alternative for `for (var i = 0; i < step; i++)`.
-  let i = size;
-  while (i--) {
-    // `| 0` is more compact and faster than `Math.floor()`.
-    id += urlAlphabet[(Math.random() * 64) | 0];
-  }
-  return id;
-}
-
-function nanonum(size = 21) {
-  let id = '';
-  let i = size;
-  while (i--) {
-    id += numberAlphabet[(Math.random() * 10) | 0];
-  }
-  return id;
-}
-
-module.exports = { nanoid, nanonum };
+// This alphabet uses `A-Za-z0-9_-` symbols. The genetic algorithm helped
+// optimize the gzip compression for this alphabet.
+const urlAlphabet =
+  'ModuleSymbhasOwnPr-0123456789ABCDEFGHNRVfgctiUvz_KqYTJkLxpZXIjQW';
+
+const numberAlphabet = '0123456789';
+
+/**
+ * Generate URL-friendly unique ID. This method uses the non-secure
+ * predictable random generator with bigger collision probability.
+ * Based on https://github.com/ai/nanoid
+ *
+ * ```js
+ * model.id = nanoid() //=> "Uakgb_J5m9g-0JDMbcJqL"
+ * ```
+ *
+ * @param size Size of the ID. The default size is 21.
+ * @returns A random string.
+ */
+function nanoid(size = 21) {
+  let id = '';
+  // A compact alternative for `for (var i = 0; i < step; i++)`.
+  let i = size;
+  while (i--) {
+    // `| 0` is more compact and faster than `Math.floor()`.
+    id += urlAlphabet[(Math.random() * 64) | 0];
+  }
+  return id;
+}
+
+function nanonum(size = 21) {
+  let id = '';
+  let i = size;
+  while (i--) {
+    id += numberAlphabet[(Math.random() * 10) | 0];
+  }
+  return id;
+}
+
+module.exports = { nanoid, nanonum };

package/lib/util/noop.js

@@ -1 +1 @@
-module.exports = function () {};
+module.exports = function () {};

package/lib/util/save-async-stack.js

@@ -1,14 +1,14 @@
-module.exports = function saveAsyncStack(instance, lines) {
-  if (instance.client.config.asyncStackTraces) {
-    // a hack to get a callstack into the client code despite this
-    // node.js bug https://github.com/nodejs/node/issues/11865
-
-    // Save error here but not error trace
-    // reading trace with '--enable-source-maps' flag on node can be very costly
-
-    instance._asyncStack = {
-      error: new Error(),
-      lines,
-    };
-  }
-};
+module.exports = function saveAsyncStack(instance, lines) {
+  if (instance.client.config.asyncStackTraces) {
+    // a hack to get a callstack into the client code despite this
+    // node.js bug https://github.com/nodejs/node/issues/11865
+
+    // Save error here but not error trace
+    // reading trace with '--enable-source-maps' flag on node can be very costly
+
+    instance._asyncStack = {
+      error: new Error(),
+      lines,
+    };
+  }
+};

package/lib/util/string.js

@@ -1,190 +1,190 @@
-/*eslint max-len: 0, no-var:0 */
-
-const charsRegex = /[\0\b\t\n\r\x1a"'\\]/g; // eslint-disable-line no-control-regex
-const charsMap = {
-  '\0': '\\0',
-  '\b': '\\b',
-  '\t': '\\t',
-  '\n': '\\n',
-  '\r': '\\r',
-  '\x1a': '\\Z',
-  '"': '\\"',
-  "'": "\\'",
-  '\\': '\\\\',
-};
-
-function wrapEscape(escapeFn) {
-  return function finalEscape(val, ctx = {}) {
-    return escapeFn(val, finalEscape, ctx);
-  };
-}
-
-function makeEscape(config = {}) {
-  const finalEscapeDate = config.escapeDate || dateToString;
-  const finalEscapeArray = config.escapeArray || arrayToList;
-  const finalEscapeBuffer = config.escapeBuffer || bufferToString;
-  const finalEscapeString = config.escapeString || escapeString;
-  const finalEscapeObject = config.escapeObject || escapeObject;
-  const finalWrap = config.wrap || wrapEscape;
-
-  function escapeFn(val, finalEscape, ctx) {
-    if (val === undefined || val === null) {
-      return 'NULL';
-    }
-    switch (typeof val) {
-      case 'boolean':
-        return val ? 'true' : 'false';
-      case 'number':
-        return val + '';
-      case 'object':
-        if (val instanceof Date) {
-          val = finalEscapeDate(val, finalEscape, ctx);
-        } else if (Array.isArray(val)) {
-          return finalEscapeArray(val, finalEscape, ctx);
-        } else if (Buffer.isBuffer(val)) {
-          return finalEscapeBuffer(val, finalEscape, ctx);
-        } else {
-          return finalEscapeObject(val, finalEscape, ctx);
-        }
-    }
-    return finalEscapeString(val, finalEscape, ctx);
-  }
-
-  return finalWrap ? finalWrap(escapeFn) : escapeFn;
-}
-
-function escapeObject(val, finalEscape, ctx) {
-  if (val && typeof val.toSQL === 'function') {
-    return val.toSQL(ctx);
-  } else {
-    return JSON.stringify(val);
-  }
-}
-
-function arrayToList(array, finalEscape, ctx) {
-  let sql = '';
-  for (let i = 0; i < array.length; i++) {
-    const val = array[i];
-    if (Array.isArray(val)) {
-      sql +=
-        (i === 0 ? '' : ', ') + '(' + arrayToList(val, finalEscape, ctx) + ')';
-    } else {
-      sql += (i === 0 ? '' : ', ') + finalEscape(val, ctx);
-    }
-  }
-  return sql;
-}
-
-function bufferToString(buffer) {
-  return 'X' + escapeString(buffer.toString('hex'));
-}
-
-function escapeString(val, finalEscape, ctx) {
-  let chunkIndex = (charsRegex.lastIndex = 0);
-  let escapedVal = '';
-  let match;
-
-  while ((match = charsRegex.exec(val))) {
-    escapedVal += val.slice(chunkIndex, match.index) + charsMap[match[0]];
-    chunkIndex = charsRegex.lastIndex;
-  }
-
-  if (chunkIndex === 0) {
-    // Nothing was escaped
-    return "'" + val + "'";
-  }
-
-  if (chunkIndex < val.length) {
-    return "'" + escapedVal + val.slice(chunkIndex) + "'";
-  }
-
-  return "'" + escapedVal + "'";
-}
-
-function dateToString(date, finalEscape, ctx = {}) {
-  const timeZone = ctx.timeZone || 'local';
-
-  const dt = new Date(date);
-  let year;
-  let month;
-  let day;
-  let hour;
-  let minute;
-  let second;
-  let millisecond;
-
-  if (timeZone === 'local') {
-    year = dt.getFullYear();
-    month = dt.getMonth() + 1;
-    day = dt.getDate();
-    hour = dt.getHours();
-    minute = dt.getMinutes();
-    second = dt.getSeconds();
-    millisecond = dt.getMilliseconds();
-  } else {
-    const tz = convertTimezone(timeZone);
-
-    if (tz !== false && tz !== 0) {
-      dt.setTime(dt.getTime() + tz * 60000);
-    }
-
-    year = dt.getUTCFullYear();
-    month = dt.getUTCMonth() + 1;
-    day = dt.getUTCDate();
-    hour = dt.getUTCHours();
-    minute = dt.getUTCMinutes();
-    second = dt.getUTCSeconds();
-    millisecond = dt.getUTCMilliseconds();
-  }
-
-  // YYYY-MM-DD HH:mm:ss.mmm
-  return (
-    zeroPad(year, 4) +
-    '-' +
-    zeroPad(month, 2) +
-    '-' +
-    zeroPad(day, 2) +
-    ' ' +
-    zeroPad(hour, 2) +
-    ':' +
-    zeroPad(minute, 2) +
-    ':' +
-    zeroPad(second, 2) +
-    '.' +
-    zeroPad(millisecond, 3)
-  );
-}
-
-function zeroPad(number, length) {
-  number = number.toString();
-  while (number.length < length) {
-    number = '0' + number;
-  }
-  return number;
-}
-
-function convertTimezone(tz) {
-  if (tz === 'Z') {
-    return 0;
-  }
-  const m = tz.match(/([+\-\s])(\d\d):?(\d\d)?/);
-  if (m) {
-    return (
-      (m[1] == '-' ? -1 : 1) *
-      (parseInt(m[2], 10) + (m[3] ? parseInt(m[3], 10) : 0) / 60) *
-      60
-    );
-  }
-  return false;
-}
-
-module.exports = {
-  arrayToList,
-  bufferToString,
-  dateToString,
-  escapeString,
-  charsRegex,
-  charsMap,
-  escapeObject,
-  makeEscape,
-};
+/*eslint max-len: 0, no-var:0 */
+
+const charsRegex = /[\0\b\t\n\r\x1a"'\\]/g; // eslint-disable-line no-control-regex
+const charsMap = {
+  '\0': '\\0',
+  '\b': '\\b',
+  '\t': '\\t',
+  '\n': '\\n',
+  '\r': '\\r',
+  '\x1a': '\\Z',
+  '"': '\\"',
+  "'": "\\'",
+  '\\': '\\\\',
+};
+
+function wrapEscape(escapeFn) {
+  return function finalEscape(val, ctx = {}) {
+    return escapeFn(val, finalEscape, ctx);
+  };
+}
+
+function makeEscape(config = {}) {
+  const finalEscapeDate = config.escapeDate || dateToString;
+  const finalEscapeArray = config.escapeArray || arrayToList;
+  const finalEscapeBuffer = config.escapeBuffer || bufferToString;
+  const finalEscapeString = config.escapeString || escapeString;
+  const finalEscapeObject = config.escapeObject || escapeObject;
+  const finalWrap = config.wrap || wrapEscape;
+
+  function escapeFn(val, finalEscape, ctx) {
+    if (val === undefined || val === null) {
+      return 'NULL';
+    }
+    switch (typeof val) {
+      case 'boolean':
+        return val ? 'true' : 'false';
+      case 'number':
+        return val + '';
+      case 'object':
+        if (val instanceof Date) {
+          val = finalEscapeDate(val, finalEscape, ctx);
+        } else if (Array.isArray(val)) {
+          return finalEscapeArray(val, finalEscape, ctx);
+        } else if (Buffer.isBuffer(val)) {
+          return finalEscapeBuffer(val, finalEscape, ctx);
+        } else {
+          return finalEscapeObject(val, finalEscape, ctx);
+        }
+    }
+    return finalEscapeString(val, finalEscape, ctx);
+  }
+
+  return finalWrap ? finalWrap(escapeFn) : escapeFn;
+}
+
+function escapeObject(val, finalEscape, ctx) {
+  if (val && typeof val.toSQL === 'function') {
+    return val.toSQL(ctx);
+  } else {
+    return JSON.stringify(val);
+  }
+}
+
+function arrayToList(array, finalEscape, ctx) {
+  let sql = '';
+  for (let i = 0; i < array.length; i++) {
+    const val = array[i];
+    if (Array.isArray(val)) {
+      sql +=
+        (i === 0 ? '' : ', ') + '(' + arrayToList(val, finalEscape, ctx) + ')';
+    } else {
+      sql += (i === 0 ? '' : ', ') + finalEscape(val, ctx);
+    }
+  }
+  return sql;
+}
+
+function bufferToString(buffer) {
+  return 'X' + escapeString(buffer.toString('hex'));
+}
+
+function escapeString(val, finalEscape, ctx) {
+  let chunkIndex = (charsRegex.lastIndex = 0);
+  let escapedVal = '';
+  let match;
+
+  while ((match = charsRegex.exec(val))) {
+    escapedVal += val.slice(chunkIndex, match.index) + charsMap[match[0]];
+    chunkIndex = charsRegex.lastIndex;
+  }
+
+  if (chunkIndex === 0) {
+    // Nothing was escaped
+    return "'" + val + "'";
+  }
+
+  if (chunkIndex < val.length) {
+    return "'" + escapedVal + val.slice(chunkIndex) + "'";
+  }
+
+  return "'" + escapedVal + "'";
+}
+
+function dateToString(date, finalEscape, ctx = {}) {
+  const timeZone = ctx.timeZone || 'local';
+
+  const dt = new Date(date);
+  let year;
+  let month;
+  let day;
+  let hour;
+  let minute;
+  let second;
+  let millisecond;
+
+  if (timeZone === 'local') {
+    year = dt.getFullYear();
+    month = dt.getMonth() + 1;
+    day = dt.getDate();
+    hour = dt.getHours();
+    minute = dt.getMinutes();
+    second = dt.getSeconds();
+    millisecond = dt.getMilliseconds();
+  } else {
+    const tz = convertTimezone(timeZone);
+
+    if (tz !== false && tz !== 0) {
+      dt.setTime(dt.getTime() + tz * 60000);
+    }
+
+    year = dt.getUTCFullYear();
+    month = dt.getUTCMonth() + 1;
+    day = dt.getUTCDate();
+    hour = dt.getUTCHours();
+    minute = dt.getUTCMinutes();
+    second = dt.getUTCSeconds();
+    millisecond = dt.getUTCMilliseconds();
+  }
+
+  // YYYY-MM-DD HH:mm:ss.mmm
+  return (
+    zeroPad(year, 4) +
+    '-' +
+    zeroPad(month, 2) +
+    '-' +
+    zeroPad(day, 2) +
+    ' ' +
+    zeroPad(hour, 2) +
+    ':' +
+    zeroPad(minute, 2) +
+    ':' +
+    zeroPad(second, 2) +
+    '.' +
+    zeroPad(millisecond, 3)
+  );
+}
+
+function zeroPad(number, length) {
+  number = number.toString();
+  while (number.length < length) {
+    number = '0' + number;
+  }
+  return number;
+}
+
+function convertTimezone(tz) {
+  if (tz === 'Z') {
+    return 0;
+  }
+  const m = tz.match(/([+\-\s])(\d\d):?(\d\d)?/);
+  if (m) {
+    return (
+      (m[1] == '-' ? -1 : 1) *
+      (parseInt(m[2], 10) + (m[3] ? parseInt(m[3], 10) : 0) / 60) *
+      60
+    );
+  }
+  return false;
+}
+
+module.exports = {
+  arrayToList,
+  bufferToString,
+  dateToString,
+  escapeString,
+  charsRegex,
+  charsMap,
+  escapeObject,
+  makeEscape,
+};

package/lib/util/timeout.js

@@ -1,29 +1,29 @@
-class KnexTimeoutError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'KnexTimeoutError';
-  }
-}
-
-function timeout(promise, ms) {
-  return new Promise(function (resolve, reject) {
-    const id = setTimeout(function () {
-      reject(new KnexTimeoutError('operation timed out'));
-    }, ms);
-
-    function wrappedResolve(value) {
-      clearTimeout(id);
-      resolve(value);
-    }
-
-    function wrappedReject(err) {
-      clearTimeout(id);
-      reject(err);
-    }
-
-    promise.then(wrappedResolve, wrappedReject);
-  });
-}
-
-module.exports.KnexTimeoutError = KnexTimeoutError;
-module.exports.timeout = timeout;
+class KnexTimeoutError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'KnexTimeoutError';
+  }
+}
+
+function timeout(promise, ms) {
+  return new Promise(function (resolve, reject) {
+    const id = setTimeout(function () {
+      reject(new KnexTimeoutError('operation timed out'));
+    }, ms);
+
+    function wrappedResolve(value) {
+      clearTimeout(id);
+      resolve(value);
+    }
+
+    function wrappedReject(err) {
+      clearTimeout(id);
+      reject(err);
+    }
+
+    promise.then(wrappedResolve, wrappedReject);
+  });
+}
+
+module.exports.KnexTimeoutError = KnexTimeoutError;
+module.exports.timeout = timeout;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "description": "A batteries-included SQL query & schema builder for PostgresSQL, MySQL, CockroachDB, MSSQL and SQLite3",
   "main": "knex",
   "types": "types/index.d.ts",
@@ -132,7 +132,7 @@
     "pg-query-stream": "^4.2.4",
     "prettier": "2.6.2",
     "rimraf": "^3.0.2",
-    "sinon": "^14.0.0",
+    "sinon": "^15.0.1",
     "sinon-chai": "^3.7.0",
     "source-map-support": "^0.5.21",
     "sqlite3": "^5.0.11",
@@ -141,8 +141,8 @@
     "tedious": "^14.4.0",
     "toxiproxy-node-client": "^2.0.6",
     "ts-node": "^10.9.1",
-    "tsd": "^0.23.0",
-    "typescript": "4.8.2"
+    "tsd": "^0.25.0",
+    "typescript": "4.8.3"
   },
   "buildDependencies": [
     "rimraf"