sasat 0.19.17 → 0.19.18

package/lib/migration/exec/getCurrentMigration.js

@@ -6,6 +6,19 @@ export var Direction;
     Direction["Up"] = "up";
     Direction["Down"] = "down";
 })(Direction || (Direction = {}));
+const calcRunMigrationFileNames = (records) => {
+    const result = [];
+    records.forEach(it => {
+        if (it.direction === Direction.Down) {
+            if (result[result.length] !== it.name)
+                throw new Error('Invalid migration history: `down` migration must be the same migration as the last `up` migration ');
+            result.pop();
+            return;
+        }
+        result.push(it.name);
+    });
+    return result;
+};
 export const getCurrentMigration = async () => {
     const migrationTable = config().migration.table;
     const files = getMigrationFileNames();
@@ -15,13 +28,19 @@ export const getCurrentMigration = async () => {
         "direction enum('up', 'down') not null, migrated_at timestamp default current_timestamp)");
     const result = await client.rawQuery(`SELECT name, direction
      FROM ${migrationTable}
-     ORDER BY id DESC LIMIT 1`);
+     ORDER BY migrated_at ASC LIMIT 1`);
     if (!result.length)
         return;
-    if (result[0].direction === Direction.Up)
-        return result[0].name;
-    const index = files.indexOf(result[0].name);
-    if (index === -1)
-        throw new Error(`${result[0].name} not found`);
-    return files[index - 1];
+    const runs = calcRunMigrationFileNames(result);
+    if (runs.length)
+        return;
+    runs.forEach((run, i) => {
+        if (files[i] !== run)
+            throw new Error(`\
+Invalid migration order: Migration must be performed in the same order 
+Found               : ${files[i]} 
+in migration history: ${run}`);
+    });
+    console.log(runs[runs.length - 1]);
+    return runs[runs.length - 1];
 };

package/lib/runtime/sasatDBDatasource.d.ts

@@ -31,13 +31,13 @@ export declare abstract class SasatDBDatasource<Entity extends EntityType, Ident
     abstract readonly fields: string[];
     protected abstract readonly primaryKeys: string[];
     protected abstract readonly identifyFields: string[];
-    protected abstract readonly autoIncrementColumn?: string;
+    protected abstract readonly autoIncrementColumn?: string | undefined;
     protected queryLogger: (sql: string) => void;
     protected commandLogger: (sql: string) => void;
     constructor(client?: SQLExecutor);
     protected abstract getDefaultValueString(): Partial<{
-        [P in keyof Entity]: Entity[P] | string | null;
-    }>;
+        [P in keyof Entity]: Entity[P] | string | null | never;
+    }> | never;
     create(entity: Creatable, upsert?: {
         updateColumns: string[];
     }): Promise<Entity>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasat",
-  "version": "0.19.17",
+  "version": "0.19.18",
   "repository": "https://github.com/nin138/sasat.git",
   "author": "nin138 <ninian138@gmail.com>",
   "license": "MIT",
@@ -9,9 +9,7 @@
   "files": [
     "lib"
   ],
-  "bin": {
-    "sasat": "lib/cli/cli.js"
-  },
+  "bin": "lib/cli/cli.js",
   "scripts": {
     "start": "env-cmd .env ts-node ./index.ts",
     "build": "yarn tsc",
@@ -74,5 +72,6 @@
       "yarn format"
     ]
   },
-  "type": "module"
+  "type": "module",
+  "packageManager": "yarn@3.6.0"
 }