rake-db 1.3.0 → 1.3.3

package/README.md

@@ -41,6 +41,18 @@ Has an option to generate names of columns, indices and foreign keys in camelCas
 
 ## Get started
 
+Install:
+
+```sh
+npm i rake-db
+```
+
+`rake-db` has peer dependencies on `ts-node` and `typescript`, if you don't have them already in your project need to install:
+
+```sh
+npm i ts-node typescript
+```
+
 Add a script into `package.json`:
 ```json
 {

package/dist/lib/migrate.d.ts

@@ -1,4 +1,4 @@
 import Migration from './migration';
-export declare const run: (db: Migration, fn: (t: Migration, up: boolean) => void | Promise<void>, version: string) => Promise<unknown[]>;
+export declare const run: (db: Migration, fn: (t: Migration, up: boolean) => void | Promise<void>, version: string) => Promise<void>;
 export declare const migrate: () => Promise<void>;
 export declare const rollback: () => Promise<void>;

package/dist/lib/migrate.js

@@ -30,8 +30,8 @@ const migration_1 = __importDefault(require("./migration"));
 const errorCodes_1 = require("./errorCodes");
 const ts_node_1 = require("ts-node");
 ts_node_1.register({ compilerOptions: { module: 'CommonJS' } });
-const getMigratedVersionsQuery = (db) => db.value(`SELECT COALESCE(json_agg("schemaMigrations".version ORDER BY version), '[]')` +
-    `FROM "schemaMigrations"`);
+const getMigratedVersionsQuery = (db) => db.value(`SELECT COALESCE(json_agg(version ORDER BY version), '[]')` +
+    `FROM "public"."schemaMigrations"`);
 const getMigratedVersions = async (db) => {
     try {
         return await getMigratedVersionsQuery(db);
@@ -73,36 +73,39 @@ const getFiles = (migrationsPath, rollback) => new Promise((resolve, reject) =>
         resolve(files);
     });
 });
-const run = async (db, fn, version) => await db.wrapperTransaction(db, async (t) => {
-    if (fn.toString().startsWith('async')) {
-        await fn(t, !db.reverse);
-    }
-    else {
-        if (!db.reverse) {
-            fn(t, true);
+const run = async (db, fn, version) => {
+    await db.wrapperTransaction(db, async (t) => {
+        if (fn.toString().startsWith('async')) {
+            await fn(t, !db.reverse);
         }
         else {
-            const originalExec = t.exec;
-            const argsList = []; // eslint-disable-line
-            t.exec = (...args) => {
-                argsList.push(args);
-                return Promise.resolve(undefined);
-            };
-            await fn(t, false);
-            t.exec = originalExec;
-            for (const args of argsList.reverse()) {
-                await t.exec(...args);
+            if (!db.reverse) {
+                fn(t, true);
+            }
+            else {
+                const originalExec = t.exec;
+                const argsList = []; // eslint-disable-line
+                t.exec = (...args) => {
+                    argsList.push(args);
+                    return Promise.resolve();
+                };
+                await fn(t, false);
+                t.exec = originalExec;
+                for (const [sql, value] of argsList.reverse()) {
+                    await t.exec(sql, value);
+                }
             }
         }
-    }
-    await t.sync();
-    if (t.failed)
-        return;
-    const sql = db.reverse
-        ? `DELETE FROM "schemaMigrations" WHERE "version" = '${version}'`
-        : `INSERT INTO "schemaMigrations" VALUES ('${version}')`;
-    await t.exec(sql).catch(utils_1.noop);
-});
+        await t.sync();
+        if (t.failed)
+            return;
+        const sql = db.reverse
+            ? `DELETE FROM "public"."schemaMigrations" WHERE "version" = '${version}'`
+            : `INSERT INTO "public"."schemaMigrations"
+         VALUES ('${version}')`;
+        await t.exec(sql).catch(utils_1.noop);
+    });
+};
 exports.run = run;
 const migrateFile = async (db, migrationsPath, version, file) => {
     const filePath = path.resolve(migrationsPath, file);
@@ -111,9 +114,17 @@ const migrateFile = async (db, migrationsPath, version, file) => {
         throw new Error(`Migration ${file} does not contain up or change exports`);
     else if (!migration.down && !migration.change)
         throw new Error(`Migration ${file} does not contain down or change exports`);
-    for (const key in migration)
-        if (key === (db.reverse ? 'down' : 'up') || key === 'change')
+    if (migration.before) {
+        await migration.before(db, !db.reverse);
+    }
+    for (const key in migration) {
+        if (key === (db.reverse ? 'down' : 'up') || key === 'change') {
             await exports.run(db, migration[key], version);
+        }
+    }
+    if (migration.after) {
+        await migration.after(db, !db.reverse);
+    }
     console.info(`${filePath} ${db.reverse ? 'rolled back' : 'migrated'}`);
 };
 const migrateDb = async (db, migrationsPath, files) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rake-db",
-  "version": "1.3.0",
+  "version": "1.3.3",
   "description": "Postgresql migrations like in Ruby on Rails",
   "bin": {
     "rake-db": "dist/rake-db.js"
@@ -25,7 +25,7 @@
     "prepublish": "tsc",
     "db": "ts-node src/rake-db.ts",
     "lint": "eslint --fix src",
-    "test": "jest test"
+    "test": "jest"
   },
   "devDependencies": {
     "@types/jest": "^25.2.1",
@@ -42,9 +42,12 @@
     "typescript": "^4.0.3"
   },
   "dependencies": {
-    "dotenv": "8.x",
+    "dotenv": "^16.0.1",
     "enquirer": "^2.3.6",
-    "pg-adapter": "^1.2.5",
-    "ts-node": "^9.1.1"
+    "pg-adapter": "^1.2.5"
+  },
+  "peerDependencies": {
+    "ts-node": "*",
+    "typescript": "*"
   }
 }