rake-db 2.29.0 → 2.29.2

package/dist/index.d.ts

@@ -1476,7 +1476,7 @@ interface RakeDbFn<Options> {
     run<SchemaConfig extends ColumnSchemaConfig, ColumnTypes = DefaultColumnTypes<DefaultSchemaConfig>>(options: Options, config: RakeDbCliConfigInput<SchemaConfig, ColumnTypes> | RakeDbConfig<ColumnTypes>, args?: string[]): RakeDbChangeFn<ColumnTypes>;
 }
 declare const rakeDbCliWithAdapter: RakeDbFn<MaybeArray<AdapterBase>>;
-declare const setRakeDbCliRunFn: <T>(rakeDbCli: RakeDbFn<T>, mapper: (options: T) => unknown) => void;
+declare const setRakeDbCliRunFn: <T>(rakeDbCli: RakeDbFn<T>) => void;
 declare const rakeDbCommands: RakeDbCommands;
 
 declare const encodeColumnDefault: (def: unknown, values: unknown[], column?: Column.Pick.Data) => string | null;
@@ -1743,8 +1743,8 @@ interface ColumnChecks {
 declare const getDbTableColumnsChecks: (tableData: StructureToAstTableData) => ColumnChecks;
 declare const dbColumnToAst: (ctx: StructureToAstCtx, data: IntrospectedStructure, domains: DbStructureDomainsMap, tableName: string, item: DbStructure.Column, table?: DbStructure.Table, tableData?: StructureToAstTableData, checks?: ColumnChecks) => [key: string, column: Column];
 
-declare const writeMigrationFile: (config: Pick<RakeDbConfig, 'migrationsPath' | 'basePath' | 'dbScript' | 'logger'>, version: string, name: string, migrationCode: string) => Promise<void>;
-declare const makeFileVersion: (ctx: RakeDbCtx, config: Pick<RakeDbConfig, 'migrationId' | 'renameMigrations' | 'migrations' | 'basePath' | 'import' | 'migrationsPath'>) => Promise<string>;
+declare const writeMigrationFile: (config: RakeDbConfig, version: string, name: string, migrationCode: string) => Promise<void>;
+declare const makeFileVersion: (ctx: RakeDbCtx, config: RakeDbConfig) => Promise<string>;
 
 declare class RakeDbError extends Error {
 }

package/dist/index.js

@@ -3110,8 +3110,20 @@ const sortMigrationsAsc = (a, b) => +a.version - +b.version;
 async function getMigrationsFromFiles(config, allowDuplicates, getVersion = getMigrationVersionOrThrow) {
   const { migrationsPath, import: imp } = config;
   const entries = await fs.readdir(migrationsPath, { withFileTypes: true }).catch(
-    () => []
+    (err) => ({ err })
   );
+  if ("err" in entries) {
+    if (entries.err.code === "ENOENT") {
+      config.logger?.log(`Directory ${migrationsPath} does not exist`);
+      return { migrations: [] };
+    } else {
+      throw entries.err;
+    }
+  } else if (!entries) {
+    config.logger?.log(
+      `Could not find any migration files in ${migrationsPath}`
+    );
+  }
   const versions = {};
   const result = entries.reduce(
     (data, file) => {
@@ -3661,8 +3673,8 @@ const createOrDropDatabase = async (action, adapters, config, dontClose) => {
   }
 };
 const resetDatabaseCommand = async (adapters, config) => {
-  await createOrDropDatabase("create", adapters, config);
-  await createOrDropDatabase("drop", adapters, config, true);
+  await createOrDropDatabase("drop", adapters, config);
+  await createOrDropDatabase("create", adapters, config, true);
   for (const adapter of adapters) {
     await migrate(adapter, config);
   }
@@ -5878,14 +5890,17 @@ const rakeDbCliWithAdapter = (inputConfig, args = process.argv.slice(2)) => {
     }
   };
 };
-const setRakeDbCliRunFn = (rakeDbCli, mapper) => {
-  rakeDbCli.run = (adapter, inputConfig, args) => {
+const setRakeDbCliRunFn = (rakeDbCli) => {
+  rakeDbCli.run = (options, inputConfig, args) => {
+    if (!("__rakeDbConfig" in inputConfig)) {
+      incrementIntermediateCaller();
+    }
     const { change, run } = rakeDbCli(inputConfig, args);
-    run(mapper(adapter));
+    run(options);
     return change;
   };
 };
-setRakeDbCliRunFn(rakeDbCliWithAdapter, (x) => x);
+setRakeDbCliRunFn(rakeDbCliWithAdapter);
 const runCommand = async (adapters, config, args) => {
   let arg = args[0]?.split(":")[0];
   if (rakeDbAliases[arg]) {