rake-db 2.10.24 → 2.10.26

package/dist/index.d.ts

@@ -968,21 +968,23 @@ type RakeDbConfig<CT extends ColumnTypesBase = DefaultColumnTypes> = {
     basePath: string;
     dbScript: string;
     migrationsPath: string;
+    migrations?: ModuleExportsRecord;
     recurrentPath: string;
     migrationsTable: string;
     snakeCase: boolean;
     language?: string;
     commands: Record<string, (options: AdapterOptions[], config: RakeDbConfig<CT>, args: string[]) => Promise<void>>;
-    import(path: string): Promise<unknown>;
     noPrimaryKey?: NoPrimaryKeyOption;
     baseTable?: BaseTable<CT>;
     appCodeUpdater?: AppCodeUpdater;
     useCodeUpdater?: boolean;
+    import(path: string): Promise<unknown>;
     beforeMigrate?(db: Db): Promise<void>;
     afterMigrate?(db: Db): Promise<void>;
     beforeRollback?(db: Db): Promise<void>;
     afterRollback?(db: Db): Promise<void>;
 } & QueryLogOptions;
+type ModuleExportsRecord = Record<string, () => Promise<unknown>>;
 type AppCodeUpdaterParams = {
     options: AdapterOptions;
     basePath: string;

package/dist/index.js

@@ -7,25 +7,6 @@ var promises = require('fs/promises');
 var prompts = require('prompts');
 var url = require('url');
 
-function _interopNamespaceDefault(e) {
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var url__namespace = /*#__PURE__*/_interopNamespaceDefault(url);
-
 var __defProp$6 = Object.defineProperty;
 var __defProps$5 = Object.defineProperties;
 var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
@@ -66,8 +47,9 @@ const migrationConfigDefaults = {
 const processRakeDbConfig = (config) => {
   var _a;
   const result = __spreadValues$6(__spreadValues$6({}, migrationConfigDefaults), config);
-  if (!result.recurrentPath)
+  if (!result.recurrentPath) {
     result.recurrentPath = path.join(result.migrationsPath, "recurrent");
+  }
   if (config.appCodeUpdater && (!("baseTable" in config) || !config.baseTable)) {
     throw new Error(
       "`baseTable` option is required in `rakeDb` for `appCodeUpdater`"
@@ -86,13 +68,13 @@ const processRakeDbConfig = (config) => {
     result.basePath = path.dirname(filePath);
     result.dbScript = path.basename(filePath);
   }
-  if (!path.isAbsolute(result.migrationsPath)) {
+  if ("migrationsPath" in result && !path.isAbsolute(result.migrationsPath)) {
     result.migrationsPath = path.resolve(
       result.basePath,
       result.migrationsPath
     );
   }
-  if (!path.isAbsolute(result.recurrentPath)) {
+  if ("recurrentPath" in result && !path.isAbsolute(result.recurrentPath)) {
     result.recurrentPath = path.resolve(result.basePath, result.recurrentPath);
   }
   if ("baseTable" in config) {
@@ -169,17 +151,28 @@ const setAdminCredentialsToOptions = async (options, create) => {
   }));
 };
 const createSchemaMigrations = async (db, config) => {
-  var _a, _b;
+  var _a, _b, _c;
+  const { schema } = db;
+  if (schema && schema !== "public") {
+    try {
+      await db.query(`CREATE SCHEMA "${schema}"`);
+      (_a = config.logger) == null ? void 0 : _a.log(`Created schema ${schema}`);
+    } catch (err) {
+      if (err.code !== "42P06") {
+        throw err;
+      }
+    }
+  }
   try {
     await db.query(
       `CREATE TABLE ${quoteWithSchema({
         name: config.migrationsTable
       })} ( version TEXT NOT NULL )`
     );
-    (_a = config.logger) == null ? void 0 : _a.log("Created versions table");
+    (_b = config.logger) == null ? void 0 : _b.log("Created versions table");
   } catch (err) {
     if (err.code === "42P07") {
-      (_b = config.logger) == null ? void 0 : _b.log("Versions table exists");
+      (_c = config.logger) == null ? void 0 : _c.log("Versions table exists");
     } else {
       throw err;
     }
@@ -212,35 +205,63 @@ const getTextAfterTo = (input) => {
 const getTextAfterFrom = (input) => {
   return getTextAfterRegExp(input, /(From|-from|_from)[A-Z-_]/, 4);
 };
-const getMigrationFiles = async (config, up) => {
-  const { migrationsPath } = config;
+const getMigrations = async (config, up) => {
+  if ("migrations" in config) {
+    const result = [];
+    const { migrations, basePath } = config;
+    for (const key in migrations) {
+      result.push({
+        path: path.resolve(basePath, key),
+        version: getVersion(path.basename(key)),
+        change: migrations[key]
+      });
+    }
+    return result;
+  }
+  const { migrationsPath, import: imp } = config;
   let files;
   try {
     files = await promises.readdir(migrationsPath);
   } catch (_) {
     return [];
   }
-  const sort = up ? sortAsc : sortDesc;
-  return sort(files.filter((file) => path.basename(file).includes("."))).map(
-    (file) => {
-      if (!file.endsWith(".ts")) {
-        throw new Error(
-          `Only .ts files are supported for migration, received: ${file}`
-        );
-      }
-      const timestampMatch = file.match(/^(\d{14})\D/);
-      if (!timestampMatch) {
-        throw new Error(
-          `Migration file name should start with 14 digit version, received ${file}`
-        );
+  files = files.filter((file) => path.basename(file).includes("."));
+  files = (up ? sortAsc : sortDesc)(files);
+  return files.map((file) => {
+    checkExt(file);
+    const filePath = path.resolve(migrationsPath, file);
+    return {
+      path: filePath,
+      version: getVersion(file),
+      async change() {
+        try {
+          await imp(filePath);
+        } catch (err) {
+          if (err.code !== "ERR_UNSUPPORTED_ESM_URL_SCHEME")
+            throw err;
+          await imp(url.pathToFileURL(filePath).pathname);
+        }
       }
-      return {
-        path: path.resolve(migrationsPath, file),
-        version: timestampMatch[1]
-      };
-    }
-  );
+    };
+  });
 };
+function checkExt(path2) {
+  const ext = path2.slice(-3);
+  if (ext !== ".ts" && ext !== ".js") {
+    throw new Error(
+      `Only .ts and .js files are supported for migration, received: ${path2}`
+    );
+  }
+}
+function getVersion(path2) {
+  const timestampMatch = path2.match(/^(\d{14})\D/);
+  if (!timestampMatch) {
+    throw new Error(
+      `Migration file name should start with 14 digit version, received ${path2}`
+    );
+  }
+  return timestampMatch[1];
+}
 const sortAsc = (arr) => arr.sort();
 const sortDesc = (arr) => arr.sort((a, b) => a > b ? -1 : 1);
 const joinColumns = (columns) => {
@@ -2178,7 +2199,7 @@ const getDb = (adapter) => pqb.createDb({ adapter });
 const migrateOrRollback = async (options, config, args, up) => {
   var _a, _b, _c, _d, _e, _f;
   config = __spreadValues$1({}, config);
-  const files = await getMigrationFiles(config, up);
+  const files = await getMigrations(config, up);
   let count = up ? Infinity : 1;
   let argI = 0;
   const num = args[0] === "all" ? Infinity : parseInt(args[0]);
@@ -2252,13 +2273,7 @@ const processMigration = async (db, up, file, config, options, appCodeUpdaterCac
     clearChanges();
     let changes = changeCache[file.path];
     if (!changes) {
-      try {
-        await config.import(file.path);
-      } catch (err) {
-        if (err.code !== "ERR_UNSUPPORTED_ESM_URL_SCHEME")
-          throw err;
-        await config.import(url__namespace.pathToFileURL(file.path).pathname);
-      }
+      await file.change();
       changes = getCurrentChanges();
       changeCache[file.path] = changes;
     }
@@ -2315,7 +2330,7 @@ const execute = async (options, sql) => {
   }
 };
 const createOrDrop = async (options, adminOptions, config, args) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d;
   const params = getDatabaseAndUserFromOptions(options);
   const result = await execute(
     setAdapterOptions(adminOptions, { database: "postgres" }),
@@ -2353,21 +2368,6 @@ Don't use this command for database service providers, only for a local db.`;
   if (!args.create)
     return;
   const db = new pqb.Adapter(options);
-  const { schema } = db;
-  if (schema) {
-    db.schema = void 0;
-    try {
-      await db.query(`CREATE SCHEMA "${schema}"`);
-      (_e = config.logger) == null ? void 0 : _e.log(`Created schema ${schema}`);
-    } catch (err) {
-      if (err.code === "42P06") {
-        (_f = config.logger) == null ? void 0 : _f.log(`Schema ${schema} already exists`);
-      } else {
-        throw err;
-      }
-    }
-    db.schema = schema;
-  }
   await createSchemaMigrations(db, config);
   await db.close();
 };