knex-migrator 4.2.10 → 5.0.1

package/lib/errors.js

@@ -1,84 +1,83 @@
-const util = require('util');
-const each = require('lodash/each');
-const errors = require('ghost-ignition').errors;
+const errors = require('@tryghost/errors');
+const merge = require('lodash/merge');
 
-function KnexMigrateError(options) {
-    options = options || {};
-    errors.IgnitionError.call(this, options);
-}
+class KnexMigrateError extends errors.MigrationError {}
 
 const knexMigratorErrors = {
-    MigrationExistsError: function MigrationExistsError(options) {
-        KnexMigrateError.call(this, Object.assign({
-            id: 100,
-            errorType: 'MigrationExistsError'
-        }, options));
+    MigrationExistsError: class MigrationExistsError extends KnexMigrateError {
+        constructor(options) {
+            super(merge({
+                id: 100,
+                errorType: 'MigrationExistsError'
+            }, options));
+        }
     },
-    DatabaseIsNotOkError: function DatabaseIsNotOkError(options) {
-        KnexMigrateError.call(this, Object.assign({
-            id: 200,
-            errorType: 'DatabaseIsNotOkError',
-            help: 'If knex-migrator is not installed, please run "npm install -g knex-migrator" \nRead more here: https://github.com/TryGhost/knex-migrator'
-        }, options));
+    DatabaseIsNotOkError: class DatabaseIsNotOkError extends KnexMigrateError {
+        constructor(options) {
+            super(merge({
+                id: 200,
+                errorType: 'DatabaseIsNotOkError',
+                help: 'If knex-migrator is not installed, please run "npm install -g knex-migrator" \nRead more here: https://github.com/TryGhost/knex-migrator'
+            }, options));
+        }
     },
-    MigrationScriptError: function MigrationScriptError(options) {
-        KnexMigrateError.call(this, Object.assign({
-            id: 300,
-            errorType: 'MigrationScriptError'
-        }, options));
+    MigrationScriptError: class MigrationScriptError extends KnexMigrateError {
+        constructor(options) {
+            super(merge({
+                id: 300,
+                errorType: 'MigrationScriptError'
+            }, options));
+        }
     },
-    RollbackError: function RollbackError(options) {
-        KnexMigrateError.call(this, Object.assign({
-            id: 400,
-            errorType: 'RollbackError'
-        }, options));
+    RollbackError: class RollbackError extends KnexMigrateError {
+        constructor(options) {
+            super(merge({
+                id: 400,
+                errorType: 'RollbackError'
+            }, options));
+        }
     },
-    MigrationsAreLockedError: function MigrationsAreLockedError(options) {
-        KnexMigrateError.call(this, Object.assign({
-            id: 500,
-            errorType: 'MigrationsAreLockedError'
-        }, options));
+    MigrationsAreLockedError: class MigrationsAreLockedError extends KnexMigrateError {
+        constructor(options) {
+            super(merge({
+                id: 500,
+                errorType: 'MigrationsAreLockedError'
+            }, options));
+        }
     },
-    LockError: function LockError(options) {
-        KnexMigrateError.call(this, Object.assign({
-            id: 500,
-            errorType: 'LockError'
-        }, options));
+    LockError: class LockError extends KnexMigrateError {
+        constructor(options) {
+            super(merge({
+                id: 500,
+                errorType: 'LockError'
+            }, options));
+        }
     },
-    UnlockError: function UnlockError(options) {
-        KnexMigrateError.call(this, Object.assign({
-            id: 500,
-            errorType: 'UnlockError'
-        }, options));
+    UnlockError: class UnlockError extends KnexMigrateError {
+        constructor(options) {
+            super(merge({
+                id: 500,
+                errorType: 'UnlockError'
+            }, options));
+        }
     },
-    DatabaseError: function DatabaseError(options) {
-        KnexMigrateError.call(this, Object.assign({
-            id: 500,
-            errorType: 'DatabaseError'
-        }, options));
+    DatabaseError: class DatabaseError extends KnexMigrateError {
+        constructor(options) {
+            super(merge({
+                id: 500,
+                errorType: 'DatabaseError'
+            }, options));
+        }
     },
-    IrreversibleMigrationError: function IrreversibleMigrationError(options) {
-        KnexMigrateError.call(this, Object.assign({
-            id: 500,
-            errorType: 'IrreversibleMigrationError'
-        }, options));
+    IrreversibleMigrationError: class IrreversibleMigrationError extends KnexMigrateError {
+        constructor(options) {
+            super(merge({
+                id: 500,
+                errorType: 'IrreversibleMigrationError'
+            }, options));
+        }
     }
 };
 
-util.inherits(KnexMigrateError, errors.IgnitionError);
-
-each(knexMigratorErrors, function (error) {
-    util.inherits(error, KnexMigrateError);
-});
-
-// we need to inherit all general errors from KnexMigrateError, otherwise we have to check instanceof IgnitionError
-each(errors, function (error) {
-    if (error.name === 'IgnitionError' || typeof error === 'object') {
-        return;
-    }
-
-    util.inherits(error, KnexMigrateError);
-});
-
 module.exports = Object.assign(knexMigratorErrors, errors);
 module.exports.KnexMigrateError = KnexMigrateError;

package/lib/index.js

@@ -233,7 +233,7 @@ KnexMigrator.prototype.init = function init(options) {
             }).then(function () {
                 throw err;
             }).catch(function (innerErr) {
-                if (errors.utils.isIgnitionError(innerErr)) {
+                if (errors.utils.isGhostError(innerErr)) {
                     throw err;
                 }
 
@@ -411,7 +411,7 @@ KnexMigrator.prototype.migrate = async function migrate(options) {
                         logging.info(`Rollback was successful.`);
                         throw err;
                     } catch (innerErr) {
-                        if (errors.utils.isIgnitionError(innerErr)) {
+                        if (errors.utils.isGhostError(innerErr)) {
                             throw err;
                         }
 

package/lib/locking.js

@@ -36,7 +36,7 @@ module.exports.lock = function (connection) {
                     });
             })
             .catch(function (err) {
-                if (errors.utils.isIgnitionError(err)) {
+                if (errors.utils.isGhostError(err)) {
                     throw err;
                 }
 
@@ -100,7 +100,7 @@ module.exports.unlock = function (connection) {
                     });
             })
             .catch(function (err) {
-                if (errors.utils.isIgnitionError(err)) {
+                if (errors.utils.isGhostError(err)) {
                     throw err;
                 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex-migrator",
-  "version": "4.2.10",
+  "version": "5.0.1",
   "description": "Database migrations with knex.",
   "keywords": [
     "ghost",
@@ -28,7 +28,7 @@
   "license": "MIT",
   "scripts": {
     "lint": "eslint --ext .js --cache lib/** test/**",
-    "test": "LEVEL=fatal _mocha --require test/utils.js --report --exit lcovonly -- test/**/*_spec.js",
+    "test": "LEVEL=fatal _mocha --require test/utils.js --report lcovonly --exit -- test/**/*_spec.js",
     "test:unit": "yarn lint && LEVEL=fatal _mocha --require test/utils.js --report lcovonly -- test/unit/*_spec.js",
     "posttest": "yarn lint",
     "coverage": "nyc --reporter=lcov _mocha --require test/utils.js -- test/*_spec.js",
@@ -44,22 +44,22 @@
     "knex-migrator-rollback": "./bin/knex-migrator-rollback"
   },
   "engines": {
-    "node": "^12.22.1 || ^14.17.0 || ^16.13.0"
+    "node": "^14.17.0 || ^16.13.0"
   },
   "dependencies": {
-    "@tryghost/database-info": "0.3.5",
-    "@tryghost/logging": "2.1.8",
+    "@tryghost/database-info": "0.3.7",
+    "@tryghost/errors": "1.2.14",
+    "@tryghost/logging": "2.2.3",
     "bluebird": "3.7.2",
     "commander": "5.1.0",
     "compare-ver": "2.0.2",
     "debug": "4.3.4",
-    "ghost-ignition": "4.6.3",
-    "knex": "2.0.0",
+    "knex": "2.1.0",
     "lodash": "4.17.21",
     "moment": "2.24.0",
     "mysql2": "2.3.3",
     "nconf": "0.12.0",
-    "resolve": "1.22.0"
+    "resolve": "1.22.1"
   },
   "files": [
     "bin",
@@ -77,6 +77,6 @@
     "sinon": "9.2.4"
   },
   "optionalDependencies": {
-    "sqlite3": "5.0.8"
+    "sqlite3": "5.0.9"
   }
 }