knex 0.21.20 → 0.21.21

package/lib/util/nanoid.js

@@ -1,29 +1,29 @@
-// This alphabet uses `A-Za-z0-9_-` symbols. The genetic algorithm helped
-// optimize the gzip compression for this alphabet.
-const urlAlphabet =
-  'ModuleSymbhasOwnPr-0123456789ABCDEFGHNRVfgctiUvz_KqYTJkLxpZXIjQW';
-
-/**
- * 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;
-}
-
-module.exports = { nanoid };
+// This alphabet uses `A-Za-z0-9_-` symbols. The genetic algorithm helped
+// optimize the gzip compression for this alphabet.
+const urlAlphabet =
+  'ModuleSymbhasOwnPr-0123456789ABCDEFGHNRVfgctiUvz_KqYTJkLxpZXIjQW';
+
+/**
+ * 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;
+}
+
+module.exports = { nanoid };

package/lib/util/noop.js

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

package/lib/util/parse-connection.js

@@ -1,66 +1,66 @@
-const url = require('url');
-const { parse } = require('pg-connection-string');
-const parsePG = parse;
-const isWindows = process && process.platform && process.platform === 'win32';
-
-module.exports = function parseConnectionString(str) {
-  const parsed = url.parse(str, true);
-  let { protocol } = parsed;
-  const isDriveLetter = isWindows && protocol && protocol.length === 2;
-  if (protocol === null || isDriveLetter) {
-    return {
-      client: 'sqlite3',
-      connection: {
-        filename: str,
-      },
-    };
-  }
-  if (protocol.slice(-1) === ':') {
-    protocol = protocol.slice(0, -1);
-  }
-
-  const isPG = ['postgresql', 'postgres'].includes(protocol);
-
-  return {
-    client: protocol,
-    connection: isPG ? parsePG(str) : connectionObject(parsed),
-  };
-};
-
-function connectionObject(parsed) {
-  const connection = {};
-  let db = parsed.pathname;
-  if (db[0] === '/') {
-    db = db.slice(1);
-  }
-
-  connection.database = db;
-
-  if (parsed.hostname) {
-    if (parsed.protocol.indexOf('mssql') === 0) {
-      connection.server = parsed.hostname;
-    } else {
-      connection.host = parsed.hostname;
-    }
-  }
-  if (parsed.port) {
-    connection.port = parsed.port;
-  }
-  if (parsed.auth) {
-    const idx = parsed.auth.indexOf(':');
-    if (idx !== -1) {
-      connection.user = parsed.auth.slice(0, idx);
-      if (idx < parsed.auth.length - 1) {
-        connection.password = parsed.auth.slice(idx + 1);
-      }
-    } else {
-      connection.user = parsed.auth;
-    }
-  }
-  if (parsed.query) {
-    for (const key in parsed.query) {
-      connection[key] = parsed.query[key];
-    }
-  }
-  return connection;
-}
+const url = require('url');
+const { parse } = require('pg-connection-string');
+const parsePG = parse;
+const isWindows = process && process.platform && process.platform === 'win32';
+
+module.exports = function parseConnectionString(str) {
+  const parsed = url.parse(str, true);
+  let { protocol } = parsed;
+  const isDriveLetter = isWindows && protocol && protocol.length === 2;
+  if (protocol === null || isDriveLetter) {
+    return {
+      client: 'sqlite3',
+      connection: {
+        filename: str,
+      },
+    };
+  }
+  if (protocol.slice(-1) === ':') {
+    protocol = protocol.slice(0, -1);
+  }
+
+  const isPG = ['postgresql', 'postgres'].includes(protocol);
+
+  return {
+    client: protocol,
+    connection: isPG ? parsePG(str) : connectionObject(parsed),
+  };
+};
+
+function connectionObject(parsed) {
+  const connection = {};
+  let db = parsed.pathname;
+  if (db[0] === '/') {
+    db = db.slice(1);
+  }
+
+  connection.database = db;
+
+  if (parsed.hostname) {
+    if (parsed.protocol.indexOf('mssql') === 0) {
+      connection.server = parsed.hostname;
+    } else {
+      connection.host = parsed.hostname;
+    }
+  }
+  if (parsed.port) {
+    connection.port = parsed.port;
+  }
+  if (parsed.auth) {
+    const idx = parsed.auth.indexOf(':');
+    if (idx !== -1) {
+      connection.user = parsed.auth.slice(0, idx);
+      if (idx < parsed.auth.length - 1) {
+        connection.password = parsed.auth.slice(idx + 1);
+      }
+    } else {
+      connection.user = parsed.auth;
+    }
+  }
+  if (parsed.query) {
+    for (const key in parsed.query) {
+      connection[key] = parsed.query[key];
+    }
+  }
+  return connection;
+}

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/template.js

@@ -1,52 +1,52 @@
-const template = require('lodash/template');
-
-const { readFile, writeFile } = require('./fs');
-
-/**
- * Light wrapper over lodash templates making it safer to be used with javascript source code.
- *
- * In particular, doesn't interfere with use of interpolated strings in javascript.
- *
- * @param {string} content Template source
- * @param {_.TemplateOptions} options Template options
- */
-const jsSourceTemplate = (content, options) =>
-  template(content, {
-    interpolate: /<%=([\s\S]+?)%>/g,
-    ...options,
-  });
-
-/**
- * Compile the contents of specified (javascript) file as a lodash template
- *
- * @param {string} filePath Path of file to be used as template
- * @param {_.TemplateOptions} options Lodash template options
- */
-const jsFileTemplate = async (filePath, options) => {
-  const contentBuffer = await readFile(filePath);
-  return jsSourceTemplate(contentBuffer.toString(), options);
-};
-
-/**
- * Write a javascript file using another file as a (lodash) template
- *
- * @param {string} targetFilePath
- * @param {string} sourceFilePath
- * @param {_.TemplateOptions} options options passed to lodash templates
- */
-const writeJsFileUsingTemplate = async (
-  targetFilePath,
-  sourceFilePath,
-  options,
-  variables
-) =>
-  writeFile(
-    targetFilePath,
-    (await jsFileTemplate(sourceFilePath, options))(variables)
-  );
-
-module.exports = {
-  jsSourceTemplate,
-  jsFileTemplate,
-  writeJsFileUsingTemplate,
-};
+const template = require('lodash/template');
+
+const { readFile, writeFile } = require('./fs');
+
+/**
+ * Light wrapper over lodash templates making it safer to be used with javascript source code.
+ *
+ * In particular, doesn't interfere with use of interpolated strings in javascript.
+ *
+ * @param {string} content Template source
+ * @param {_.TemplateOptions} options Template options
+ */
+const jsSourceTemplate = (content, options) =>
+  template(content, {
+    interpolate: /<%=([\s\S]+?)%>/g,
+    ...options,
+  });
+
+/**
+ * Compile the contents of specified (javascript) file as a lodash template
+ *
+ * @param {string} filePath Path of file to be used as template
+ * @param {_.TemplateOptions} options Lodash template options
+ */
+const jsFileTemplate = async (filePath, options) => {
+  const contentBuffer = await readFile(filePath);
+  return jsSourceTemplate(contentBuffer.toString(), options);
+};
+
+/**
+ * Write a javascript file using another file as a (lodash) template
+ *
+ * @param {string} targetFilePath
+ * @param {string} sourceFilePath
+ * @param {_.TemplateOptions} options options passed to lodash templates
+ */
+const writeJsFileUsingTemplate = async (
+  targetFilePath,
+  sourceFilePath,
+  options,
+  variables
+) =>
+  writeFile(
+    targetFilePath,
+    (await jsFileTemplate(sourceFilePath, options))(variables)
+  );
+
+module.exports = {
+  jsSourceTemplate,
+  jsFileTemplate,
+  writeJsFileUsingTemplate,
+};

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/lib/util/timestamp.js

@@ -1,16 +1,16 @@
-// Get a date object in the correct format, without requiring a full out library
-// like "moment.js".
-function yyyymmddhhmmss() {
-  const d = new Date();
-
-  return (
-    d.getFullYear().toString() +
-    (d.getMonth() + 1).toString().padStart(2, '0') +
-    d.getDate().toString().padStart(2, '0') +
-    d.getHours().toString().padStart(2, '0') +
-    d.getMinutes().toString().padStart(2, '0') +
-    d.getSeconds().toString().padStart(2, '0')
-  );
-}
-
-module.exports = { yyyymmddhhmmss };
+// Get a date object in the correct format, without requiring a full out library
+// like "moment.js".
+function yyyymmddhhmmss() {
+  const d = new Date();
+
+  return (
+    d.getFullYear().toString() +
+    (d.getMonth() + 1).toString().padStart(2, '0') +
+    d.getDate().toString().padStart(2, '0') +
+    d.getHours().toString().padStart(2, '0') +
+    d.getMinutes().toString().padStart(2, '0') +
+    d.getSeconds().toString().padStart(2, '0')
+  );
+}
+
+module.exports = { yyyymmddhhmmss };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex",
-  "version": "0.21.20",
+  "version": "0.21.21",
   "description": "A batteries-included SQL query & schema builder for Postgres, MySQL and SQLite3 and the Browser",
   "main": "knex.js",
   "types": "types/index.d.ts",