knex 2.3.0 → 2.4.1

package/lib/logger.js

@@ -1,76 +1,76 @@
-const color = require('colorette');
-const { inspect } = require('util');
-const { isString, isFunction } = require('./util/is');
-
-class Logger {
-  constructor(config = {}) {
-    const {
-      log: {
-        debug,
-        warn,
-        error,
-        deprecate,
-        inspectionDepth,
-        enableColors,
-      } = {},
-    } = config;
-    this._inspectionDepth = inspectionDepth || 5;
-    this._enableColors = resolveIsEnabledColors(enableColors);
-    this._debug = debug;
-    this._warn = warn;
-    this._error = error;
-    this._deprecate = deprecate;
-  }
-
-  _log(message, userFn, colorFn) {
-    if (userFn != null && !isFunction(userFn)) {
-      throw new TypeError('Extensions to knex logger must be functions!');
-    }
-
-    if (isFunction(userFn)) {
-      userFn(message);
-      return;
-    }
-
-    if (!isString(message)) {
-      message = inspect(message, {
-        depth: this._inspectionDepth,
-        colors: this._enableColors,
-      });
-    }
-
-    console.log(colorFn ? colorFn(message) : message);
-  }
-
-  debug(message) {
-    this._log(message, this._debug);
-  }
-
-  warn(message) {
-    this._log(message, this._warn, color.yellow);
-  }
-
-  error(message) {
-    this._log(message, this._error, color.red);
-  }
-
-  deprecate(method, alternative) {
-    const message = `${method} is deprecated, please use ${alternative}`;
-
-    this._log(message, this._deprecate, color.yellow);
-  }
-}
-
-function resolveIsEnabledColors(enableColorsParam) {
-  if (enableColorsParam != null) {
-    return enableColorsParam;
-  }
-
-  if (process && process.stdout) {
-    return process.stdout.isTTY;
-  }
-
-  return false;
-}
-
-module.exports = Logger;
+const color = require('colorette');
+const { inspect } = require('util');
+const { isString, isFunction } = require('./util/is');
+
+class Logger {
+  constructor(config = {}) {
+    const {
+      log: {
+        debug,
+        warn,
+        error,
+        deprecate,
+        inspectionDepth,
+        enableColors,
+      } = {},
+    } = config;
+    this._inspectionDepth = inspectionDepth || 5;
+    this._enableColors = resolveIsEnabledColors(enableColors);
+    this._debug = debug;
+    this._warn = warn;
+    this._error = error;
+    this._deprecate = deprecate;
+  }
+
+  _log(message, userFn, colorFn) {
+    if (userFn != null && !isFunction(userFn)) {
+      throw new TypeError('Extensions to knex logger must be functions!');
+    }
+
+    if (isFunction(userFn)) {
+      userFn(message);
+      return;
+    }
+
+    if (!isString(message)) {
+      message = inspect(message, {
+        depth: this._inspectionDepth,
+        colors: this._enableColors,
+      });
+    }
+
+    console.log(colorFn ? colorFn(message) : message);
+  }
+
+  debug(message) {
+    this._log(message, this._debug);
+  }
+
+  warn(message) {
+    this._log(message, this._warn, color.yellow);
+  }
+
+  error(message) {
+    this._log(message, this._error, color.red);
+  }
+
+  deprecate(method, alternative) {
+    const message = `${method} is deprecated, please use ${alternative}`;
+
+    this._log(message, this._deprecate, color.yellow);
+  }
+}
+
+function resolveIsEnabledColors(enableColorsParam) {
+  if (enableColorsParam != null) {
+    return enableColorsParam;
+  }
+
+  if (process && process.stdout) {
+    return process.stdout.isTTY;
+  }
+
+  return false;
+}
+
+module.exports = Logger;

package/lib/migrations/common/MigrationsLoader.js

@@ -1,36 +1,36 @@
-const path = require('path');
-const DEFAULT_LOAD_EXTENSIONS = Object.freeze([
-  '.co',
-  '.coffee',
-  '.eg',
-  '.iced',
-  '.js',
-  '.cjs',
-  '.litcoffee',
-  '.ls',
-  '.ts',
-]);
-
-class AbstractMigrationsLoader {
-  constructor(migrationDirectories, sortDirsSeparately, loadExtensions) {
-    this.sortDirsSeparately = sortDirsSeparately;
-
-    if (!Array.isArray(migrationDirectories)) {
-      migrationDirectories = [migrationDirectories];
-    }
-    this.migrationsPaths = migrationDirectories;
-    this.loadExtensions = loadExtensions || DEFAULT_LOAD_EXTENSIONS;
-  }
-
-  getFile(migrationsInfo) {
-    const absoluteDir = path.resolve(process.cwd(), migrationsInfo.directory);
-    const _path = path.join(absoluteDir, migrationsInfo.file);
-    const importFile = require('../util/import-file'); // late import
-    return importFile(_path);
-  }
-}
-
-module.exports = {
-  DEFAULT_LOAD_EXTENSIONS,
-  AbstractMigrationsLoader,
-};
+const path = require('path');
+const DEFAULT_LOAD_EXTENSIONS = Object.freeze([
+  '.co',
+  '.coffee',
+  '.eg',
+  '.iced',
+  '.js',
+  '.cjs',
+  '.litcoffee',
+  '.ls',
+  '.ts',
+]);
+
+class AbstractMigrationsLoader {
+  constructor(migrationDirectories, sortDirsSeparately, loadExtensions) {
+    this.sortDirsSeparately = sortDirsSeparately;
+
+    if (!Array.isArray(migrationDirectories)) {
+      migrationDirectories = [migrationDirectories];
+    }
+    this.migrationsPaths = migrationDirectories;
+    this.loadExtensions = loadExtensions || DEFAULT_LOAD_EXTENSIONS;
+  }
+
+  getFile(migrationsInfo) {
+    const absoluteDir = path.resolve(process.cwd(), migrationsInfo.directory);
+    const _path = path.join(absoluteDir, migrationsInfo.file);
+    const importFile = require('../util/import-file'); // late import
+    return importFile(_path);
+  }
+}
+
+module.exports = {
+  DEFAULT_LOAD_EXTENSIONS,
+  AbstractMigrationsLoader,
+};

package/lib/migrations/migrate/MigrationGenerator.js

@@ -1,82 +1,82 @@
-const path = require('path');
-const { writeJsFileUsingTemplate } = require('../util/template');
-const { getMergedConfig } = require('./migrator-configuration-merger');
-const { ensureDirectoryExists } = require('../util/fs');
-const { yyyymmddhhmmss } = require('../util/timestamp');
-
-class MigrationGenerator {
-  constructor(migrationConfig, logger) {
-    this.config = getMergedConfig(migrationConfig, undefined, logger);
-  }
-
-  // Creates a new migration, with a given name.
-  async make(name, config, logger) {
-    this.config = getMergedConfig(config, this.config, logger);
-    if (!name) {
-      return Promise.reject(
-        new Error('A name must be specified for the generated migration')
-      );
-    }
-    await this._ensureFolder();
-    const createdMigrationFilePath = await this._writeNewMigration(name);
-    return createdMigrationFilePath;
-  }
-
-  // Ensures a folder for the migrations exist, dependent on the migration
-  // config settings.
-  _ensureFolder() {
-    const dirs = this._absoluteConfigDirs();
-
-    const promises = dirs.map(ensureDirectoryExists);
-
-    return Promise.all(promises);
-  }
-
-  _getStubPath() {
-    return (
-      this.config.stub ||
-      path.join(__dirname, 'stub', this.config.extension + '.stub')
-    );
-  }
-
-  _getNewMigrationName(name) {
-    if (name[0] === '-') name = name.slice(1);
-    return yyyymmddhhmmss() + '_' + name + '.' + this.config.extension.split('-')[0];
-  }
-
-  _getNewMigrationPath(name) {
-    const fileName = this._getNewMigrationName(name);
-    const dirs = this._absoluteConfigDirs();
-    const dir = dirs.slice(-1)[0]; // Get last specified directory
-    return path.join(dir, fileName);
-  }
-
-  // Write a new migration to disk, using the config and generated filename,
-  // passing any `variables` given in the config to the template.
-  async _writeNewMigration(name) {
-    const migrationPath = this._getNewMigrationPath(name);
-    await writeJsFileUsingTemplate(
-      migrationPath,
-      this._getStubPath(),
-      { variable: 'd' },
-      this.config.variables || {}
-    );
-    return migrationPath;
-  }
-
-  _absoluteConfigDirs() {
-    const directories = Array.isArray(this.config.directory)
-      ? this.config.directory
-      : [this.config.directory];
-    return directories.map((directory) => {
-      if (!directory) {
-        console.warn(
-          'Failed to resolve config file, knex cannot determine where to generate migrations'
-        );
-      }
-      return path.resolve(process.cwd(), directory);
-    });
-  }
-}
-
-module.exports = MigrationGenerator;
+const path = require('path');
+const { writeJsFileUsingTemplate } = require('../util/template');
+const { getMergedConfig } = require('./migrator-configuration-merger');
+const { ensureDirectoryExists } = require('../util/fs');
+const { yyyymmddhhmmss } = require('../util/timestamp');
+
+class MigrationGenerator {
+  constructor(migrationConfig, logger) {
+    this.config = getMergedConfig(migrationConfig, undefined, logger);
+  }
+
+  // Creates a new migration, with a given name.
+  async make(name, config, logger) {
+    this.config = getMergedConfig(config, this.config, logger);
+    if (!name) {
+      return Promise.reject(
+        new Error('A name must be specified for the generated migration')
+      );
+    }
+    await this._ensureFolder();
+    const createdMigrationFilePath = await this._writeNewMigration(name);
+    return createdMigrationFilePath;
+  }
+
+  // Ensures a folder for the migrations exist, dependent on the migration
+  // config settings.
+  _ensureFolder() {
+    const dirs = this._absoluteConfigDirs();
+
+    const promises = dirs.map(ensureDirectoryExists);
+
+    return Promise.all(promises);
+  }
+
+  _getStubPath() {
+    return (
+      this.config.stub ||
+      path.join(__dirname, 'stub', this.config.extension + '.stub')
+    );
+  }
+
+  _getNewMigrationName(name) {
+    if (name[0] === '-') name = name.slice(1);
+    return yyyymmddhhmmss() + '_' + name + '.' + this.config.extension.split('-')[0];
+  }
+
+  _getNewMigrationPath(name) {
+    const fileName = this._getNewMigrationName(name);
+    const dirs = this._absoluteConfigDirs();
+    const dir = dirs.slice(-1)[0]; // Get last specified directory
+    return path.join(dir, fileName);
+  }
+
+  // Write a new migration to disk, using the config and generated filename,
+  // passing any `variables` given in the config to the template.
+  async _writeNewMigration(name) {
+    const migrationPath = this._getNewMigrationPath(name);
+    await writeJsFileUsingTemplate(
+      migrationPath,
+      this._getStubPath(),
+      { variable: 'd' },
+      this.config.variables || {}
+    );
+    return migrationPath;
+  }
+
+  _absoluteConfigDirs() {
+    const directories = Array.isArray(this.config.directory)
+      ? this.config.directory
+      : [this.config.directory];
+    return directories.map((directory) => {
+      if (!directory) {
+        console.warn(
+          'Failed to resolve config file, knex cannot determine where to generate migrations'
+        );
+      }
+      return path.resolve(process.cwd(), directory);
+    });
+  }
+}
+
+module.exports = MigrationGenerator;