@ad-sdk/bgd 0.0.8 → 0.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ad-sdk/bgd",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "main": "index.js",
   "license": "BSD-3-Clause",
   "repository": {

package/sqlx/migrations.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.migrate = migrate;
 var _nodePath = _interopRequireDefault(require("node:path"));
 var fs = _interopRequireWildcard(require("node:fs"));
-var _uidlib = require("uidlib");
 var _errors = require("../errors");
 var _core = require("./core");
 var _either = require("../lifecycle/either");
+var _uidlib = require("uidlib");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
@@ -25,73 +25,89 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 
 async function migrate(driver, directory, options) {
   try {
-    if (!fs.existsSync(directory)) {
+    const dirPath = directory.toString();
+    if (!fs.existsSync(dirPath)) {
       if (options?.ensure) {
-        throw new _errors.BGDException("[@@migrate] Migrations directory not found", "ER_IO_FAIL");
+        throw new _errors.BGDException("[@@migrate] Migrations directory not found", "ER_IO_FAIL" // eslint-disable-line comma-dangle
+        );
       }
-      options?.logger?.log("Migrations directory not found at '%s'", directory.toString());
+      options?.logger?.log("Migrations directory not found at '%s'", dirPath);
       return (0, _either.right)(void 0);
     }
-    const contentsList = await fs.promises.readdir(directory, {
-      withFileTypes: true
-    });
-    const executed = await listExecuted_(driver);
+    const filesToProcess = (await collectMigrationFiles_(dirPath, options?.recursive ?? false)).toSorted((a, b) => a.filename.localeCompare(b.filename));
+    if (filesToProcess.length === 0) return (0, _either.right)(void 0);
+    const executedLogs = await listExecuted_(driver);
+    const executedFilenames = new Set(executedLogs.map(item => item.filename));
     const tx = await driver.createTransaction({
       allowQueryBatch: true
     });
-    for (let i = 0; i < contentsList.length; ++i) {
-      if (!_core.SQL_MIGRATION_FILE_PATTERN.test(contentsList[i].name)) continue;
-      const currPath = _nodePath.default.join(contentsList[i].parentPath, contentsList[i].name // eslint-disable-line comma-dangle
-      );
-      if (contentsList[i].isDirectory() && options?.recursive) {
-        const res = await migrate(driver, currPath, options);
-        if (res.isLeft()) {
-          throw res.value;
+    try {
+      for (const file of filesToProcess) {
+        if (executedFilenames.has(file.filename)) {
+          options?.logger?.log("[@@migrate] Migration \"%s\" has already executed. Skipping...", file.filename);
+          continue;
         }
-        continue;
-      }
-      if (!contentsList[i].isFile()) continue;
-      if (executed.some(item => {
-        return item.filename === contentsList[i].name;
-      })) {
-        options?.logger?.log("[@@migrate] Migration \"%s\" has already executed. Skipping...", contentsList[i].name);
-        continue;
-      }
-      const fc = await fs.promises.readFile(currPath, "utf8");
-      const res = await tx.execBatch([{
-        query: fc.trim()
-      }, {
-        query: `INSERT INTO bgd_migrations (
-            migration_id, filename, order
-          ) VALUES ($1::TEXT, $2::TEXT, $3::VARCHAR)`,
-        values: [(0, _uidlib.uuidv7)(), contentsList[0].name, contentsList[i].name.split("_")[0]]
-      }]);
-      for (let j = 0; j < res.length; ++j) {
-        if (res[j].isLeft()) {
-          await tx.rollback();
-          throw res[j].value;
+        options?.logger?.log("[@@migrate] Running \"%s\"...", file.filename);
+        const sqlContent = (await fs.promises.readFile(file.fullPath, "utf8")).trim();
+        const orderPrefix = file.filename.split("_")[0] || "000";
+        const r1 = await tx.exec(sqlContent);
+        if (r1.isLeft()) {
+          throw r1.value;
+        }
+        const r2 = await tx.exec(`INSERT INTO bgd_migrations (migration_id, filename, sort_index)
+          VALUES ($1::TEXT, $2::TEXT, $3::TEXT)`, [(0, _uidlib.uuidv7)(), file.filename, orderPrefix] // eslint-disable-line comma-dangle
+        );
+        if (r2.isLeft()) {
+          throw r2.value;
         }
       }
+      await tx.commit();
+      return (0, _either.right)(void 0);
+    } catch (err) {
+      await tx.rollback();
+      throw err;
     }
-    await tx.commit();
-    return (0, _either.right)(void 0);
   } catch (err) {
     let e = err;
     if (!(err instanceof _errors.BGDException)) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      e = new _errors.BGDException(`[@@migrate] Failed to execute SQL migration due to: ${err?.message || String(err) || "Unknown error"}`);
+      e = new _errors.BGDException(`[@@migrate] ${err?.message || String(err) || "Unknown error"}`);
     }
     return (0, _either.left)(e);
   }
 }
+async function collectMigrationFiles_(dirPath, recursive) {
+  const res = [];
+  const contents = await fs.promises.readdir(dirPath, {
+    withFileTypes: true
+  });
+  for (const entry of contents) {
+    const fullPath = _nodePath.default.join(dirPath, entry.name);
+    if (entry.isDirectory()) {
+      if (recursive) {
+        const children = await collectMigrationFiles_(fullPath, recursive);
+        res.push(...children);
+      }
+      continue;
+    }
+    if (entry.isFile() && _core.SQL_MIGRATION_FILE_PATTERN.test(entry.name)) {
+      res.push({
+        fullPath,
+        filename: entry.name
+      });
+    }
+  }
+  return res;
+}
 const PGCT_QUERY = `CREATE TABLE IF NOT EXISTS bgd_migrations (
   migration_id VARCHAR(100) NOT NULL UNIQUE PRIMARY KEY,
   sequence SERIAL NOT NULL,
   filename VARCHAR(255) NOT NULL UNIQUE,
-  order VARCHAR(4) NOT NULL,
-  executed_at TIMESTAMP WITH TIME ZONE NOT NULL
+  sort_index VARCHAR(4) NOT NULL,
+
+  executed_at TIMESTAMPTZ NOT NULL
     DEFAULT (NOW() AT TIME ZONE 'UTC')
-)`;
+);`;
 async function ensureTable_(driver) {
   let text = "";
   switch (driver.dialect) {
@@ -101,13 +117,13 @@ async function ensureTable_(driver) {
       }
       break;
     default:
-      throw new _errors.BGDException(`[@@ensureTable_] Unknown or unsupported database dialect "${driver.dialect}"`);
+      throw new _errors.BGDException("[@@ensureTable_] Unknown or unsupported database dialect");
   }
   await driver.exec(text);
 }
 async function listExecuted_(driver) {
   await ensureTable_(driver);
-  const res = await driver.exec("SELECT * FROM bgd_migrations");
+  const res = await driver.exec("SELECT * FROM migrations");
   if (res.isLeft()) {
     throw res.value;
   }