knex 0.21.20 → 0.21.21

package/lib/util/batchInsert.js

@@ -1,59 +1,59 @@
-const chunk = require('lodash/chunk');
-const flatten = require('lodash/flatten');
-const delay = require('./delay');
-const { isNumber } = require('./is');
-
-module.exports = function batchInsert(
-  client,
-  tableName,
-  batch,
-  chunkSize = 1000
-) {
-  let returning = void 0;
-  let transaction = null;
-
-  const runInTransaction = (cb) => {
-    if (transaction) {
-      return cb(transaction);
-    }
-    return client.transaction(cb);
-  };
-
-  return Object.assign(
-    Promise.resolve().then(async () => {
-      if (!isNumber(chunkSize) || chunkSize < 1) {
-        throw new TypeError(`Invalid chunkSize: ${chunkSize}`);
-      }
-
-      if (!Array.isArray(batch)) {
-        throw new TypeError(
-          `Invalid batch: Expected array, got ${typeof batch}`
-        );
-      }
-
-      const chunks = chunk(batch, chunkSize);
-
-      //Next tick to ensure wrapper functions are called if needed
-      await delay(1);
-      return runInTransaction(async (tr) => {
-        const chunksResults = [];
-        for (const items of chunks) {
-          chunksResults.push(await tr(tableName).insert(items, returning));
-        }
-        return flatten(chunksResults);
-      });
-    }),
-    {
-      returning(columns) {
-        returning = columns;
-
-        return this;
-      },
-      transacting(tr) {
-        transaction = tr;
-
-        return this;
-      },
-    }
-  );
-};
+const chunk = require('lodash/chunk');
+const flatten = require('lodash/flatten');
+const delay = require('./delay');
+const { isNumber } = require('./is');
+
+module.exports = function batchInsert(
+  client,
+  tableName,
+  batch,
+  chunkSize = 1000
+) {
+  let returning = void 0;
+  let transaction = null;
+
+  const runInTransaction = (cb) => {
+    if (transaction) {
+      return cb(transaction);
+    }
+    return client.transaction(cb);
+  };
+
+  return Object.assign(
+    Promise.resolve().then(async () => {
+      if (!isNumber(chunkSize) || chunkSize < 1) {
+        throw new TypeError(`Invalid chunkSize: ${chunkSize}`);
+      }
+
+      if (!Array.isArray(batch)) {
+        throw new TypeError(
+          `Invalid batch: Expected array, got ${typeof batch}`
+        );
+      }
+
+      const chunks = chunk(batch, chunkSize);
+
+      //Next tick to ensure wrapper functions are called if needed
+      await delay(1);
+      return runInTransaction(async (tr) => {
+        const chunksResults = [];
+        for (const items of chunks) {
+          chunksResults.push(await tr(tableName).insert(items, returning));
+        }
+        return flatten(chunksResults);
+      });
+    }),
+    {
+      returning(columns) {
+        returning = columns;
+
+        return this;
+      },
+      transacting(tr) {
+        transaction = tr;
+
+        return this;
+      },
+    }
+  );
+};

package/lib/util/delay.js

@@ -1,6 +1,6 @@
-/**
- * @param {number} delay
- * @returns {Promise<void>}
- */
-module.exports = (delay) =>
-  new Promise((resolve) => setTimeout(resolve, delay));
+/**
+ * @param {number} delay
+ * @returns {Promise<void>}
+ */
+module.exports = (delay) =>
+  new Promise((resolve) => setTimeout(resolve, delay));

package/lib/util/fake-client.js

@@ -1,9 +1,9 @@
-const Formatter = require('../formatter');
-
-const fakeClient = {
-  formatter(builder) {
-    return new Formatter(fakeClient, builder);
-  },
-};
-
-module.exports = fakeClient;
+const Formatter = require('../formatter');
+
+const fakeClient = {
+  formatter(builder) {
+    return new Formatter(fakeClient, builder);
+  },
+};
+
+module.exports = fakeClient;

package/lib/util/finally-mixin.js

@@ -1,13 +1,13 @@
-const noop = require('./noop');
-
-const finallyMixin = (prototype) =>
-  Object.assign(prototype, {
-    finally(onFinally) {
-      return this.then().finally(onFinally);
-    },
-  });
-
-// FYI: Support for `Promise.prototype.finally` was not introduced until Node 9.
-//      Therefore, Knex will need to conditionally inject support for `.finally(..)`
-//      until support for Node 8 is officially dropped.
-module.exports = Promise.prototype.finally ? finallyMixin : noop;
+const noop = require('./noop');
+
+const finallyMixin = (prototype) =>
+  Object.assign(prototype, {
+    finally(onFinally) {
+      return this.then().finally(onFinally);
+    },
+  });
+
+// FYI: Support for `Promise.prototype.finally` was not introduced until Node 9.
+//      Therefore, Knex will need to conditionally inject support for `.finally(..)`
+//      until support for Node 8 is officially dropped.
+module.exports = Promise.prototype.finally ? finallyMixin : noop;

package/lib/util/fs.js

@@ -1,76 +1,76 @@
-const fs = require('fs');
-const flatten = require('lodash/flatten');
-const os = require('os');
-const path = require('path');
-const { promisify } = require('util');
-
-// Promisify common fs functions.
-const stat = promisify(fs.stat);
-const readFile = promisify(fs.readFile);
-const writeFile = promisify(fs.writeFile);
-const readdir = promisify(fs.readdir);
-const mkdir = promisify(fs.mkdir);
-
-/**
- * Creates a temporary directory and returns it path.
- *
- * @returns {Promise<string>}
- */
-function createTemp() {
-  return promisify(fs.mkdtemp)(`${os.tmpdir()}${path.sep}`);
-}
-
-/**
- * Ensures the given path exists.
- *  - If the path already exist, it's fine - it does nothing.
- *  - If the path doesn't exist, it will create it.
- *
- * @param {string} path
- * @returns {Promise}
- */
-function ensureDirectoryExists(dir) {
-  return stat(dir).catch(() => mkdir(dir, { recursive: true }));
-}
-
-/**
- * Read a directory,
- * sorting folders and files by alphabetically order.
- * Can be browsed recursively.
- *
- * @param {string} dir
- * The directory to analyse
- *
- * @param {boolean} recursive
- * Browse directory recursively
- *
- * @returns {Promise<[string]>}
- * All found files, concatenated to the current dir
- */
-async function getFilepathsInFolder(dir, recursive = false) {
-  const pathsList = await readdir(dir);
-  return flatten(
-    await Promise.all(
-      pathsList.sort().map(async (currentPath) => {
-        const currentFile = path.resolve(dir, currentPath);
-        const statFile = await stat(currentFile);
-        if (statFile && statFile.isDirectory()) {
-          if (recursive) {
-            return await getFilepathsInFolder(currentFile, true);
-          }
-          return [];
-        }
-        return [currentFile];
-      })
-    )
-  );
-}
-
-module.exports = {
-  stat,
-  readdir,
-  readFile,
-  writeFile,
-  createTemp,
-  ensureDirectoryExists,
-  getFilepathsInFolder,
-};
+const fs = require('fs');
+const flatten = require('lodash/flatten');
+const os = require('os');
+const path = require('path');
+const { promisify } = require('util');
+
+// Promisify common fs functions.
+const stat = promisify(fs.stat);
+const readFile = promisify(fs.readFile);
+const writeFile = promisify(fs.writeFile);
+const readdir = promisify(fs.readdir);
+const mkdir = promisify(fs.mkdir);
+
+/**
+ * Creates a temporary directory and returns it path.
+ *
+ * @returns {Promise<string>}
+ */
+function createTemp() {
+  return promisify(fs.mkdtemp)(`${os.tmpdir()}${path.sep}`);
+}
+
+/**
+ * Ensures the given path exists.
+ *  - If the path already exist, it's fine - it does nothing.
+ *  - If the path doesn't exist, it will create it.
+ *
+ * @param {string} path
+ * @returns {Promise}
+ */
+function ensureDirectoryExists(dir) {
+  return stat(dir).catch(() => mkdir(dir, { recursive: true }));
+}
+
+/**
+ * Read a directory,
+ * sorting folders and files by alphabetically order.
+ * Can be browsed recursively.
+ *
+ * @param {string} dir
+ * The directory to analyse
+ *
+ * @param {boolean} recursive
+ * Browse directory recursively
+ *
+ * @returns {Promise<[string]>}
+ * All found files, concatenated to the current dir
+ */
+async function getFilepathsInFolder(dir, recursive = false) {
+  const pathsList = await readdir(dir);
+  return flatten(
+    await Promise.all(
+      pathsList.sort().map(async (currentPath) => {
+        const currentFile = path.resolve(dir, currentPath);
+        const statFile = await stat(currentFile);
+        if (statFile && statFile.isDirectory()) {
+          if (recursive) {
+            return await getFilepathsInFolder(currentFile, true);
+          }
+          return [];
+        }
+        return [currentFile];
+      })
+    )
+  );
+}
+
+module.exports = {
+  stat,
+  readdir,
+  readFile,
+  writeFile,
+  createTemp,
+  ensureDirectoryExists,
+  getFilepathsInFolder,
+};

package/lib/util/import-file.js

@@ -1,13 +1,13 @@
-const isModuleType = require('./is-module-type');
-
-/**
- * imports 'mjs', else requires.
- * NOTE: require me late!
- * @param {string} filepath
- * @todo WARN on version 10 and '--experimental-modules' and '--esm'
- */
-module.exports = async function importFile(filepath) {
-  return (await isModuleType(filepath))
-    ? import(require('url').pathToFileURL(filepath))
-    : require(filepath);
-};
+const isModuleType = require('./is-module-type');
+
+/**
+ * imports 'mjs', else requires.
+ * NOTE: require me late!
+ * @param {string} filepath
+ * @todo WARN on version 10 and '--experimental-modules' and '--esm'
+ */
+module.exports = async function importFile(filepath) {
+  return (await isModuleType(filepath))
+    ? import(require('url').pathToFileURL(filepath))
+    : require(filepath);
+};

package/lib/util/is-module-type.js

@@ -1,14 +1,14 @@
-const { readFile } = require('./fs');
-
-module.exports = async function isModuleType(filepath) {
-  if (process.env.npm_package_json) {
-    // npm >= 7.0.0
-    const packageJson = JSON.parse(
-      await readFile(process.env.npm_package_json, 'utf-8')
-    );
-    if (packageJson.type === 'module') {
-      return true;
-    }
-  }
-  return process.env.npm_package_type === 'module' || filepath.endsWith('.mjs');
-};
+const { readFile } = require('./fs');
+
+module.exports = async function isModuleType(filepath) {
+  if (process.env.npm_package_json) {
+    // npm >= 7.0.0
+    const packageJson = JSON.parse(
+      await readFile(process.env.npm_package_json, 'utf-8')
+    );
+    if (packageJson.type === 'module') {
+      return true;
+    }
+  }
+  return process.env.npm_package_type === 'module' || filepath.endsWith('.mjs');
+};

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,
+};