@noego/proper 0.2.0 → 0.2.2

package/bin/cli.js

@@ -192,6 +192,16 @@ var DatabaseConnectionError = class _DatabaseConnectionError extends MigrationEr
     return new _DatabaseConnectionError(`Authentication failed for ${dbType} database`);
   }
 };
+var MigrationStampError = class _MigrationStampError extends MigrationError {
+  constructor(migrationKey) {
+    super(
+      `Migration '${migrationKey}' cannot be migrated: its timestamp ends in "000", so it does not look like it was generated by 'proper create'. Recreate it with 'proper create <name>' and move the SQL into the generated files.`
+    );
+    this.migrationKey = migrationKey;
+    this.name = "MigrationStampError";
+    Object.setPrototypeOf(this, _MigrationStampError.prototype);
+  }
+};
 var MigrationExecutionError = class _MigrationExecutionError extends MigrationError {
   constructor(message, migrationName, sql, originalError) {
     let fullMessage = `Migration Execution Error${migrationName ? ` in '${migrationName}'` : ""}: ${message}`;
@@ -454,8 +464,19 @@ var SqlMigrationBuilder = class {
 // framework/MigrationManifest.ts
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
+var MIGRATION_FILE_REGEX = /(?:\.(mysql|sqlite|pg))?\.(up|down)\.(sql|js)$/i;
+function isMigrationFile(fileName) {
+  return MIGRATION_FILE_REGEX.test(fileName);
+}
 function canonicalMigrationKey(value) {
-  return value.replace(/(?:\.(mysql|sqlite|pg))?\.(up|down)\.(sql|js)$/i, "").toLowerCase();
+  return value.replace(MIGRATION_FILE_REGEX, "").toLowerCase();
+}
+function mintMigrationStamp(now = Date.now()) {
+  return now % 10 === 0 ? now + 1 : now;
+}
+function isHandStampedKey(key) {
+  const stamp = key.split("_")[0];
+  return /^\d+$/.test(stamp) && /000$/.test(stamp);
 }
 function resolveMigrationFile(directory, baseName, direction, dialect) {
   const dialectExt = dialect === "sql" ? "mysql" : dialect;
@@ -468,7 +489,7 @@ function resolveMigrationFile(directory, baseName, direction, dialect) {
 function loadMigrationManifest(directory, dialect) {
   const manifest = /* @__PURE__ */ new Map();
   if (!import_fs.default.existsSync(directory)) return manifest;
-  const files = import_fs.default.readdirSync(directory, { withFileTypes: true }).filter((f) => f.isFile()).map((f) => f.name);
+  const files = import_fs.default.readdirSync(directory, { withFileTypes: true }).filter((f) => f.isFile()).map((f) => f.name).filter(isMigrationFile);
   const uniqueKeys = /* @__PURE__ */ new Set();
   files.forEach((file) => uniqueKeys.add(canonicalMigrationKey(file)));
   uniqueKeys.forEach((key) => {
@@ -505,7 +526,7 @@ var MigrationDirectoryReader = class {
   }
   loadMigrations(table, connection) {
     import_fs2.default.existsSync(this.directory) || import_fs2.default.mkdirSync(this.directory);
-    const dir_content = import_fs2.default.readdirSync(this.directory, { withFileTypes: true }).filter((file) => file.isFile()).map((file) => file.name);
+    const dir_content = import_fs2.default.readdirSync(this.directory, { withFileTypes: true }).filter((file) => file.isFile()).map((file) => file.name).filter(isMigrationFile);
     const uniqueKeys = /* @__PURE__ */ new Set();
     dir_content.forEach((file) => {
       const key = canonicalMigrationKey(file);
@@ -1353,7 +1374,7 @@ var PatchCreator = class _PatchCreator {
     if (!import_fs5.default.existsSync(this.patchFolder)) {
       import_fs5.default.mkdirSync(this.patchFolder, { recursive: true });
     }
-    let stamp = Date.now();
+    let stamp = mintMigrationStamp();
     for (let attempt = 0; attempt < 1e3; attempt++) {
       const filePath = import_path4.default.join(this.patchFolder, `${stamp}_${normalized}.yaml`);
       try {
@@ -1361,7 +1382,7 @@ var PatchCreator = class _PatchCreator {
         return filePath;
       } catch (error) {
         if (error && error.code === "EEXIST") {
-          stamp += 1;
+          stamp = mintMigrationStamp(stamp + 1);
           continue;
         }
         throw error;
@@ -1952,6 +1973,14 @@ var MySQLMigrationRunner = class {
   migrate(migrationNodes, forward) {
     return __async(this, null, function* () {
       yield this.setup();
+      if (forward) {
+        for (const node of migrationNodes) {
+          const key = node.get_key();
+          if (isHandStampedKey(key) && !(yield node.status()).completed) {
+            throw new MigrationStampError(key);
+          }
+        }
+      }
       for (let node of migrationNodes) {
         try {
           if (forward) {
@@ -2089,7 +2118,7 @@ var MigrationCreator = class {
       if (!import_fs6.default.existsSync(this.config.migration_folder)) {
         import_fs6.default.mkdirSync(this.config.migration_folder, { recursive: true });
       }
-      const now_timestamp = Date.now();
+      const now_timestamp = mintMigrationStamp();
       const filename_up = `${now_timestamp}_${name}.up.sql`;
       const filename_down = `${now_timestamp}_${name}.down.sql`;
       import_fs6.default.writeFileSync(`${this.config.migration_folder}/${filename_up}`, `