sqlmorpheus 0.1.5 → 0.1.6

package/dist/index.js

@@ -115,7 +115,7 @@ var TableStructureGenerator = class {
           columnData.defaultValue = value === null ? this.dialect.typeNull : `"${this.dialect.formatValueToSql(value)}"`;
           break;
         case "number":
-          columnData.type = this.dialect.typeNumber;
+          columnData.type = this.dialect.typeInt;
           columnData.defaultValue = value === null ? this.dialect.typeNull : this.dialect.formatValueToSql(value);
           break;
         case "boolean":
@@ -254,36 +254,15 @@ var MigrationHistoryManager = class {
     (0, import_node_fs.mkdirSync)(this.configPath, { recursive: true });
     (0, import_node_fs.mkdirSync)(this.migrationsPath, { recursive: true });
   }
-  /**
-   * Retrieves the last recorded history version from the configuration path.
-   * If the version is not already cached in memory, this method reads it from a file on disk.
-   *
-   * @return The last version number, or 0 if the version file does not exist or cannot be parsed.
-   */
-  getLastHistoryVersion() {
-    if (this.lastVersion)
-      return this.lastVersion;
-    const path = `${this.configPath}/last_version.txt`;
-    this.lastVersion = (0, import_node_fs.existsSync)(path) ? parseInt((0, import_fs.readFileSync)(`${this.configPath}/last_version.txt`, { encoding: "utf-8" })) ?? 0 : 0;
-    return this.lastVersion;
-  }
-  /**
-   * Updates the "last history version" information by writing the given version to a file.
-   *
-   * @param version - The version number to set as the last history version.
-   */
-  setLastHistoryVersion(version) {
-    (0, import_node_fs.writeFileSync)(`${this.configPath}/last_version.txt`, version.toString(), { encoding: "utf-8" });
-  }
   /**
    * Creates migration history files for upgrading and downgrading database schemas.
    *
+   * @param fromVersion - The current version number of the database.
    * @param toVersion - The target version number for the migration.
    * @param changes - An object containing the SQL changes for upgrading (`changes.up`) and downgrading (`changes.down`).
    * @param overwriteExisting - A flag that determines if existing migration files should be overwritten. Defaults to `false`.
    */
-  createMigrationHistory(toVersion, changes, overwriteExisting) {
-    const fromVersion = this.getLastHistoryVersion();
+  createMigrationHistory(fromVersion, toVersion, changes, overwriteExisting) {
     const upPath = `${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion}.sql`;
     const downPath = `${this.migrationsPath}/${FILENAME_DOWN_PREFIX}${fromVersion}.sql`;
     if ((0, import_node_fs.existsSync)(upPath) && !overwriteExisting)
@@ -306,7 +285,7 @@ ${changes.down}`, { encoding: "utf-8" });
    * @return The content of the SQL migration script as a string.
    */
   getUpMigration(toVersion) {
-    return (0, import_fs.readFileSync)(`${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion ?? this.getLastHistoryVersion()}.sql`, { encoding: "utf-8" });
+    return (0, import_fs.readFileSync)(`${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion}.sql`, { encoding: "utf-8" });
   }
   /**
    * Retrieves the SQL migration script for downgrading to the specified version.
@@ -320,13 +299,14 @@ ${changes.down}`, { encoding: "utf-8" });
 };
 
 // src/lib/dialects/DefaultSql.ts
+var MIGRATION_DATA_TABLE_NAME = "__sqlmorpheus_migrations";
 var DefaultSql = class {
   canAlterForeignKeys = false;
   canAlterPrimaryKey = false;
   canInspectForeignKeys = false;
   canInspectPrimaryKey = false;
   typeString = "TEXT";
-  typeNumber = "INTEGER";
+  typeInt = "INTEGER";
   typeBoolean = "BOOLEAN";
   typeNull = "NULL";
   formatValueToSql(value) {
@@ -369,8 +349,8 @@ var DefaultSql = class {
   dropTable(tableName) {
     return `DROP TABLE IF EXISTS ${tableName};`;
   }
-  columnDefinition(tableName, type, defaultValue, isPrimaryKey) {
-    const query = `${tableName} ${type} DEFAULT ${defaultValue}`;
+  columnDefinition(columnName, type, defaultValue, isPrimaryKey) {
+    const query = `${columnName} ${type} DEFAULT ${defaultValue}`;
     return isPrimaryKey ? `${query} PRIMARY KEY` : query;
   }
   createColumn(columnTable, entry) {
@@ -397,6 +377,30 @@ var DefaultSql = class {
   insertValues(keys, valueString) {
     return `(${keys}) ${valueString ?? `VALUES (${keys.map(() => "?").join(",")})`}`;
   }
+  migrationTableQuery() {
+    return this.createTable(MIGRATION_DATA_TABLE_NAME, [
+      this.columnDefinition("version", this.typeInt, "0", false)
+    ]);
+  }
+  async createMigrationTableIfNeeded(db) {
+    await db.runMultipleWriteStatements(this.migrationTableQuery());
+  }
+  //TODO: untested
+  async getVersion(db) {
+    await this.createMigrationTableIfNeeded(db);
+    const query = this.select(MIGRATION_DATA_TABLE_NAME, ["version"]);
+    const data = await db.runGetStatement(query);
+    return data.length ? data[0].version : 0;
+  }
+  //TODO: untested
+  async setVersion(db, newVersion) {
+    const query = `${this.migrationTableQuery()};
+INSERT INTO ${MIGRATION_DATA_TABLE_NAME} (version) VALUES ${newVersion} WHERE NOT EXISTS (SELECT 1 FROM ${MIGRATION_DATA_TABLE_NAME})
+UNION ALL
+UPDATE ${MIGRATION_DATA_TABLE_NAME} SET version = ${newVersion} WHERE EXISTS (SELECT 1 FROM ${MIGRATION_DATA_TABLE_NAME});
+`;
+    await db.runMultipleWriteStatements(query);
+  }
 };
 
 // src/lib/dialects/SqliteDialect.ts
@@ -444,6 +448,13 @@ var SqliteDialect = class extends DefaultSql {
         return value.toString();
     }
   }
+  async getVersion(db) {
+    const output = await db.runGetStatement(`PRAGMA user_version;`);
+    return output[0].user_version;
+  }
+  async setVersion(db, newVersion) {
+    await db.runMultipleWriteStatements(`PRAGMA user_version = ${newVersion};`);
+  }
 };
 
 // src/lib/dialects/PostgresDialect.ts
@@ -582,6 +593,22 @@ var MySqlDialect = class extends DefaultSql {
   }
 };
 
+// src/lib/getDialect.ts
+function getDialect(dbInstructions) {
+  switch (dbInstructions.dialect) {
+    case "Sqlite":
+      return new SqliteDialect();
+    case "Postgres":
+      return new PostgresDialect();
+    case "MsSql":
+      return new MsSqlDialect();
+    case "MySql":
+      return new MySqlDialect();
+    default:
+      throw new Error(`Unknown dialect ${dbInstructions.dialect}`);
+  }
+}
+
 // src/lib/MigrationManager.ts
 var MigrationManager = class {
   migrations = new Migrations();
@@ -592,22 +619,7 @@ var MigrationManager = class {
   migrationHistoryManager;
   dialect;
   constructor(db, dbInstructions) {
-    switch (dbInstructions.dialect) {
-      case "Sqlite":
-        this.dialect = new SqliteDialect();
-        break;
-      case "Postgres":
-        this.dialect = new PostgresDialect();
-        break;
-      case "MsSql":
-        this.dialect = new MsSqlDialect();
-        break;
-      case "MySql":
-        this.dialect = new MySqlDialect();
-        break;
-      default:
-        throw new Error(`Unknown dialect ${dbInstructions.dialect}`);
-    }
+    this.dialect = getDialect(dbInstructions);
     this.db = db;
     this.dbInstructions = dbInstructions;
     this.tableStructureGenerator = new TableStructureGenerator(dbInstructions, this.dialect);
@@ -627,7 +639,7 @@ var MigrationManager = class {
   async getMigrateSql() {
     if (this.dbInstructions.version <= 0)
       throw new Error("Cannot migrate to version 0 or lower");
-    const fromVersion = this.migrationHistoryManager.getLastHistoryVersion();
+    const fromVersion = await this.dialect.getVersion(this.db);
     if (fromVersion == 0) {
       Logger.log(`Creating initial migration to version ${this.dbInstructions.version}`);
       return this.createAndDropTables();
@@ -703,7 +715,8 @@ ${foreignKeyOnQuery}`;
     const changes = await this.getMigrateSql();
     if (!changes)
       return;
-    this.migrationHistoryManager.createMigrationHistory(this.dbInstructions.version, changes, overwriteExisting);
+    const fromVersion = await this.dialect.getVersion(this.db);
+    this.migrationHistoryManager.createMigrationHistory(fromVersion, this.dbInstructions.version, changes, overwriteExisting);
   }
   /**
    * Generates SQL change statements for creating and dropping tables based on the current table structure
@@ -1007,7 +1020,8 @@ async function prepareMigration(db, instructions, overwriteExisting) {
 async function runPreparedMigrations(db, instructions) {
   Logger.setMode(instructions.loggerMode);
   const migrationHistoryManager = new MigrationHistoryManager(instructions.configPath);
-  const fromVersion = migrationHistoryManager.getLastHistoryVersion();
+  const dialect = getDialect(instructions);
+  const fromVersion = await dialect.getVersion(db);
   const toVersion = instructions.version;
   if (fromVersion == toVersion)
     return;
@@ -1018,7 +1032,7 @@ async function runPreparedMigrations(db, instructions) {
     await db.runMultipleWriteStatements(upChanges);
     instructions.version = i;
   }
-  migrationHistoryManager.setLastHistoryVersion(toVersion);
+  await dialect.setVersion(db, toVersion);
 }
 async function prepareAndRunMigration(db, instructions, overwriteExisting) {
   Logger.setMode(instructions.loggerMode);
@@ -1035,7 +1049,8 @@ async function runMigrationWithoutHistory(db, instructions) {
 async function rollback(db, instructions, toVersion) {
   Logger.setMode(instructions.loggerMode);
   const migrationHistoryManager = new MigrationHistoryManager(instructions.configPath);
-  const fromVersion = migrationHistoryManager.getLastHistoryVersion();
+  const dialect = getDialect(instructions);
+  const fromVersion = await dialect.getVersion(db);
   Logger.log(`Rolling back from ${fromVersion} to ${toVersion}`);
   for (let i = fromVersion - 1; i >= toVersion; --i) {
     const upChanges = migrationHistoryManager.getDownMigration(i);
@@ -1043,7 +1058,7 @@ async function rollback(db, instructions, toVersion) {
     await db.runMultipleWriteStatements(upChanges);
     instructions.version = i;
   }
-  migrationHistoryManager.setLastHistoryVersion(toVersion);
+  await dialect.setVersion(db, toVersion);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -83,7 +83,7 @@ var TableStructureGenerator = class {
           columnData.defaultValue = value === null ? this.dialect.typeNull : `"${this.dialect.formatValueToSql(value)}"`;
           break;
         case "number":
-          columnData.type = this.dialect.typeNumber;
+          columnData.type = this.dialect.typeInt;
           columnData.defaultValue = value === null ? this.dialect.typeNull : this.dialect.formatValueToSql(value);
           break;
         case "boolean":
@@ -222,36 +222,15 @@ var MigrationHistoryManager = class {
     mkdirSync(this.configPath, { recursive: true });
     mkdirSync(this.migrationsPath, { recursive: true });
   }
-  /**
-   * Retrieves the last recorded history version from the configuration path.
-   * If the version is not already cached in memory, this method reads it from a file on disk.
-   *
-   * @return The last version number, or 0 if the version file does not exist or cannot be parsed.
-   */
-  getLastHistoryVersion() {
-    if (this.lastVersion)
-      return this.lastVersion;
-    const path = `${this.configPath}/last_version.txt`;
-    this.lastVersion = existsSync(path) ? parseInt(readFileSync(`${this.configPath}/last_version.txt`, { encoding: "utf-8" })) ?? 0 : 0;
-    return this.lastVersion;
-  }
-  /**
-   * Updates the "last history version" information by writing the given version to a file.
-   *
-   * @param version - The version number to set as the last history version.
-   */
-  setLastHistoryVersion(version) {
-    writeFileSync(`${this.configPath}/last_version.txt`, version.toString(), { encoding: "utf-8" });
-  }
   /**
    * Creates migration history files for upgrading and downgrading database schemas.
    *
+   * @param fromVersion - The current version number of the database.
    * @param toVersion - The target version number for the migration.
    * @param changes - An object containing the SQL changes for upgrading (`changes.up`) and downgrading (`changes.down`).
    * @param overwriteExisting - A flag that determines if existing migration files should be overwritten. Defaults to `false`.
    */
-  createMigrationHistory(toVersion, changes, overwriteExisting) {
-    const fromVersion = this.getLastHistoryVersion();
+  createMigrationHistory(fromVersion, toVersion, changes, overwriteExisting) {
     const upPath = `${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion}.sql`;
     const downPath = `${this.migrationsPath}/${FILENAME_DOWN_PREFIX}${fromVersion}.sql`;
     if (existsSync(upPath) && !overwriteExisting)
@@ -274,7 +253,7 @@ ${changes.down}`, { encoding: "utf-8" });
    * @return The content of the SQL migration script as a string.
    */
   getUpMigration(toVersion) {
-    return readFileSync(`${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion ?? this.getLastHistoryVersion()}.sql`, { encoding: "utf-8" });
+    return readFileSync(`${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion}.sql`, { encoding: "utf-8" });
   }
   /**
    * Retrieves the SQL migration script for downgrading to the specified version.
@@ -288,13 +267,14 @@ ${changes.down}`, { encoding: "utf-8" });
 };
 
 // src/lib/dialects/DefaultSql.ts
+var MIGRATION_DATA_TABLE_NAME = "__sqlmorpheus_migrations";
 var DefaultSql = class {
   canAlterForeignKeys = false;
   canAlterPrimaryKey = false;
   canInspectForeignKeys = false;
   canInspectPrimaryKey = false;
   typeString = "TEXT";
-  typeNumber = "INTEGER";
+  typeInt = "INTEGER";
   typeBoolean = "BOOLEAN";
   typeNull = "NULL";
   formatValueToSql(value) {
@@ -337,8 +317,8 @@ var DefaultSql = class {
   dropTable(tableName) {
     return `DROP TABLE IF EXISTS ${tableName};`;
   }
-  columnDefinition(tableName, type, defaultValue, isPrimaryKey) {
-    const query = `${tableName} ${type} DEFAULT ${defaultValue}`;
+  columnDefinition(columnName, type, defaultValue, isPrimaryKey) {
+    const query = `${columnName} ${type} DEFAULT ${defaultValue}`;
     return isPrimaryKey ? `${query} PRIMARY KEY` : query;
   }
   createColumn(columnTable, entry) {
@@ -365,6 +345,30 @@ var DefaultSql = class {
   insertValues(keys, valueString) {
     return `(${keys}) ${valueString ?? `VALUES (${keys.map(() => "?").join(",")})`}`;
   }
+  migrationTableQuery() {
+    return this.createTable(MIGRATION_DATA_TABLE_NAME, [
+      this.columnDefinition("version", this.typeInt, "0", false)
+    ]);
+  }
+  async createMigrationTableIfNeeded(db) {
+    await db.runMultipleWriteStatements(this.migrationTableQuery());
+  }
+  //TODO: untested
+  async getVersion(db) {
+    await this.createMigrationTableIfNeeded(db);
+    const query = this.select(MIGRATION_DATA_TABLE_NAME, ["version"]);
+    const data = await db.runGetStatement(query);
+    return data.length ? data[0].version : 0;
+  }
+  //TODO: untested
+  async setVersion(db, newVersion) {
+    const query = `${this.migrationTableQuery()};
+INSERT INTO ${MIGRATION_DATA_TABLE_NAME} (version) VALUES ${newVersion} WHERE NOT EXISTS (SELECT 1 FROM ${MIGRATION_DATA_TABLE_NAME})
+UNION ALL
+UPDATE ${MIGRATION_DATA_TABLE_NAME} SET version = ${newVersion} WHERE EXISTS (SELECT 1 FROM ${MIGRATION_DATA_TABLE_NAME});
+`;
+    await db.runMultipleWriteStatements(query);
+  }
 };
 
 // src/lib/dialects/SqliteDialect.ts
@@ -412,6 +416,13 @@ var SqliteDialect = class extends DefaultSql {
         return value.toString();
     }
   }
+  async getVersion(db) {
+    const output = await db.runGetStatement(`PRAGMA user_version;`);
+    return output[0].user_version;
+  }
+  async setVersion(db, newVersion) {
+    await db.runMultipleWriteStatements(`PRAGMA user_version = ${newVersion};`);
+  }
 };
 
 // src/lib/dialects/PostgresDialect.ts
@@ -550,6 +561,22 @@ var MySqlDialect = class extends DefaultSql {
   }
 };
 
+// src/lib/getDialect.ts
+function getDialect(dbInstructions) {
+  switch (dbInstructions.dialect) {
+    case "Sqlite":
+      return new SqliteDialect();
+    case "Postgres":
+      return new PostgresDialect();
+    case "MsSql":
+      return new MsSqlDialect();
+    case "MySql":
+      return new MySqlDialect();
+    default:
+      throw new Error(`Unknown dialect ${dbInstructions.dialect}`);
+  }
+}
+
 // src/lib/MigrationManager.ts
 var MigrationManager = class {
   migrations = new Migrations();
@@ -560,22 +587,7 @@ var MigrationManager = class {
   migrationHistoryManager;
   dialect;
   constructor(db, dbInstructions) {
-    switch (dbInstructions.dialect) {
-      case "Sqlite":
-        this.dialect = new SqliteDialect();
-        break;
-      case "Postgres":
-        this.dialect = new PostgresDialect();
-        break;
-      case "MsSql":
-        this.dialect = new MsSqlDialect();
-        break;
-      case "MySql":
-        this.dialect = new MySqlDialect();
-        break;
-      default:
-        throw new Error(`Unknown dialect ${dbInstructions.dialect}`);
-    }
+    this.dialect = getDialect(dbInstructions);
     this.db = db;
     this.dbInstructions = dbInstructions;
     this.tableStructureGenerator = new TableStructureGenerator(dbInstructions, this.dialect);
@@ -595,7 +607,7 @@ var MigrationManager = class {
   async getMigrateSql() {
     if (this.dbInstructions.version <= 0)
       throw new Error("Cannot migrate to version 0 or lower");
-    const fromVersion = this.migrationHistoryManager.getLastHistoryVersion();
+    const fromVersion = await this.dialect.getVersion(this.db);
     if (fromVersion == 0) {
       Logger.log(`Creating initial migration to version ${this.dbInstructions.version}`);
       return this.createAndDropTables();
@@ -671,7 +683,8 @@ ${foreignKeyOnQuery}`;
     const changes = await this.getMigrateSql();
     if (!changes)
       return;
-    this.migrationHistoryManager.createMigrationHistory(this.dbInstructions.version, changes, overwriteExisting);
+    const fromVersion = await this.dialect.getVersion(this.db);
+    this.migrationHistoryManager.createMigrationHistory(fromVersion, this.dbInstructions.version, changes, overwriteExisting);
   }
   /**
    * Generates SQL change statements for creating and dropping tables based on the current table structure
@@ -975,7 +988,8 @@ async function prepareMigration(db, instructions, overwriteExisting) {
 async function runPreparedMigrations(db, instructions) {
   Logger.setMode(instructions.loggerMode);
   const migrationHistoryManager = new MigrationHistoryManager(instructions.configPath);
-  const fromVersion = migrationHistoryManager.getLastHistoryVersion();
+  const dialect = getDialect(instructions);
+  const fromVersion = await dialect.getVersion(db);
   const toVersion = instructions.version;
   if (fromVersion == toVersion)
     return;
@@ -986,7 +1000,7 @@ async function runPreparedMigrations(db, instructions) {
     await db.runMultipleWriteStatements(upChanges);
     instructions.version = i;
   }
-  migrationHistoryManager.setLastHistoryVersion(toVersion);
+  await dialect.setVersion(db, toVersion);
 }
 async function prepareAndRunMigration(db, instructions, overwriteExisting) {
   Logger.setMode(instructions.loggerMode);
@@ -1003,7 +1017,8 @@ async function runMigrationWithoutHistory(db, instructions) {
 async function rollback(db, instructions, toVersion) {
   Logger.setMode(instructions.loggerMode);
   const migrationHistoryManager = new MigrationHistoryManager(instructions.configPath);
-  const fromVersion = migrationHistoryManager.getLastHistoryVersion();
+  const dialect = getDialect(instructions);
+  const fromVersion = await dialect.getVersion(db);
   Logger.log(`Rolling back from ${fromVersion} to ${toVersion}`);
   for (let i = fromVersion - 1; i >= toVersion; --i) {
     const upChanges = migrationHistoryManager.getDownMigration(i);
@@ -1011,7 +1026,7 @@ async function rollback(db, instructions, toVersion) {
     await db.runMultipleWriteStatements(upChanges);
     instructions.version = i;
   }
-  migrationHistoryManager.setLastHistoryVersion(toVersion);
+  await dialect.setVersion(db, toVersion);
 }
 export {
   DbTable,

package/package.json

@@ -1,39 +1,39 @@
-{
-  "name": "sqlmorpheus",
-  "version": "0.1.5",
-  "author": "JodliDev",
-  "keywords": [],
-  "license": "MIT",
-  "description": "",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/JodliDev/SqlMorpheus.git"
-  },
-  "bugs": {
-    "url": "https://github.com/JodliDev/SqlMorpheus/issues"
-  },
-  "homepage": "https://github.com/JodliDev/SqlMorpheus#readme",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "/dist"
-  ],
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "publish": "npm publish"
-  },
-  "devDependencies": {
-    "@types/better-sqlite3": "^7.6.13",
-    "@types/node": "^24.0.13",
-    "better-sqlite3": "^12.2.0",
-    "tsup": "^8.5.0",
-    "typescript": "^5.8.3",
-    "vitest": "^3.2.4"
-  },
-  "dependencies": {
-    "polyfill-symbol-metadata": "^0.0.2"
-  }
-}
+{
+  "name": "sqlmorpheus",
+  "version": "0.1.6",
+  "author": "JodliDev",
+  "keywords": [],
+  "license": "MIT",
+  "description": "",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/JodliDev/SqlMorpheus.git"
+  },
+  "bugs": {
+    "url": "https://github.com/JodliDev/SqlMorpheus/issues"
+  },
+  "homepage": "https://github.com/JodliDev/SqlMorpheus#readme",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "/dist"
+  ],
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "run_publish": "npm publish"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/node": "^24.0.13",
+    "better-sqlite3": "^12.2.0",
+    "tsup": "^8.5.0",
+    "typescript": "^5.8.3",
+    "vitest": "^3.2.4"
+  },
+  "dependencies": {
+    "polyfill-symbol-metadata": "^0.0.2"
+  }
+}