@noego/proper 0.2.0 → 0.2.2

package/bin/cli.mjs

@@ -121,7 +121,7 @@ var init_MigrationFilter = __esm({
 });
 
 // framework/errors.ts
-var MigrationError, ConfigurationError, DatabaseConnectionError, MigrationExecutionError, PatchError, PatchValidationError, PatchIntegrityError, PatchConflictError, PatchExecutionError, CLIError;
+var MigrationError, ConfigurationError, DatabaseConnectionError, MigrationStampError, MigrationExecutionError, PatchError, PatchValidationError, PatchIntegrityError, PatchConflictError, PatchExecutionError, CLIError;
 var init_errors = __esm({
   "framework/errors.ts"() {
     MigrationError = class _MigrationError extends Error {
@@ -187,6 +187,16 @@ var init_errors = __esm({
         return new _DatabaseConnectionError(`Authentication failed for ${dbType} database`);
       }
     };
+    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);
+      }
+    };
     MigrationExecutionError = class _MigrationExecutionError extends MigrationError {
       constructor(message, migrationName, sql, originalError) {
         let fullMessage = `Migration Execution Error${migrationName ? ` in '${migrationName}'` : ""}: ${message}`;
@@ -463,8 +473,18 @@ var init_SqlMigrationBuilder = __esm({
 // framework/MigrationManifest.ts
 import fs from "fs";
 import path from "path";
+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;
@@ -477,7 +497,7 @@ function resolveMigrationFile(directory, baseName, direction, dialect) {
 function loadMigrationManifest(directory, dialect) {
   const manifest = /* @__PURE__ */ new Map();
   if (!fs.existsSync(directory)) return manifest;
-  const files = fs.readdirSync(directory, { withFileTypes: true }).filter((f) => f.isFile()).map((f) => f.name);
+  const files = fs.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) => {
@@ -489,8 +509,10 @@ function loadMigrationManifest(directory, dialect) {
   });
   return manifest;
 }
+var MIGRATION_FILE_REGEX;
 var init_MigrationManifest = __esm({
   "framework/MigrationManifest.ts"() {
+    MIGRATION_FILE_REGEX = /(?:\.(mysql|sqlite|pg))?\.(up|down)\.(sql|js)$/i;
   }
 });
 
@@ -524,7 +546,7 @@ var init_MigrationDirectoryReader = __esm({
       }
       loadMigrations(table, connection) {
         fs2.existsSync(this.directory) || fs2.mkdirSync(this.directory);
-        const dir_content = fs2.readdirSync(this.directory, { withFileTypes: true }).filter((file) => file.isFile()).map((file) => file.name);
+        const dir_content = fs2.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);
@@ -1370,6 +1392,7 @@ var MAX_NAME_LENGTH, SCAFFOLD, PatchCreator;
 var init_PatchCreator = __esm({
   "framework/PatchCreator.ts"() {
     init_errors();
+    init_MigrationManifest();
     MAX_NAME_LENGTH = 120;
     SCAFFOLD = `version: 1
 description: TODO
@@ -1416,7 +1439,7 @@ operations: []
         if (!fs5.existsSync(this.patchFolder)) {
           fs5.mkdirSync(this.patchFolder, { recursive: true });
         }
-        let stamp = Date.now();
+        let stamp = mintMigrationStamp();
         for (let attempt = 0; attempt < 1e3; attempt++) {
           const filePath = path4.join(this.patchFolder, `${stamp}_${normalized}.yaml`);
           try {
@@ -1424,7 +1447,7 @@ operations: []
             return filePath;
           } catch (error) {
             if (error && error.code === "EEXIST") {
-              stamp += 1;
+              stamp = mintMigrationStamp(stamp + 1);
               continue;
             }
             throw error;
@@ -1782,6 +1805,8 @@ var init_MigrationRunner = __esm({
     init_PatchRunner();
     init_PatchCreator();
     init_PatchTypes();
+    init_MigrationManifest();
+    init_errors();
     init_SQLRunner();
     init_errors();
     MigrationRunnerFactory = class _MigrationRunnerFactory {
@@ -2035,6 +2060,14 @@ var init_MigrationRunner = __esm({
       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) {
@@ -2172,7 +2205,7 @@ var init_MigrationRunner = __esm({
           if (!fs6.existsSync(this.config.migration_folder)) {
             fs6.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`;
           fs6.writeFileSync(`${this.config.migration_folder}/${filename_up}`, `