rake-db 2.19.1 → 2.20.1

package/dist/index.d.ts

@@ -1293,7 +1293,10 @@ interface InputRakeDbConfig<SchemaConfig extends ColumnSchemaConfig, CT> extends
     commands?: Record<string, (options: AdapterOptions[], config: RakeDbConfig<SchemaConfig, CT extends undefined ? DefaultColumnTypes<DefaultSchemaConfig> : CT>, args: string[]) => void | Promise<void>>;
     noPrimaryKey?: NoPrimaryKeyOption;
     forceDefaultExports?: boolean;
-    import?(path: string): Promise<unknown>;
+    /**
+     * It may look odd, but it's required for `tsx` and other bundlers to have such `import` config specified explicitly.
+     */
+    import(path: string): Promise<unknown>;
     /**
      * Is called once per db before migrating or rolling back a set of migrations.
      *
@@ -1390,7 +1393,6 @@ declare const migrationConfigDefaults: {
     migrationsTable: string;
     snakeCase: false;
     commands: {};
-    import: (path: string) => Promise<any>;
     log: true;
     logger: Console;
 };
@@ -1629,7 +1631,7 @@ interface StructureToAstTableData {
     constraints: DbStructure.Constraint[];
 }
 declare const makeStructureToAstCtx: (config: AnyRakeDbConfig, currentSchema: string) => StructureToAstCtx;
-declare const structureToAst: (ctx: StructureToAstCtx, adapter: Adapter) => Promise<RakeDbAst[]>;
+declare const structureToAst: (ctx: StructureToAstCtx, adapter: Adapter, config: AnyRakeDbConfig) => Promise<RakeDbAst[]>;
 declare const makeDomainsMap: (ctx: StructureToAstCtx, data: IntrospectedStructure) => DbStructureDomainsMap;
 declare const instantiateDbColumn: (ctx: StructureToAstCtx, data: IntrospectedStructure, domains: DbStructureDomainsMap, dbColumn: DbStructure.Column) => ColumnType<orchid_core.ColumnTypeSchemaArg, unknown, any, pqb.BaseOperators, unknown, unknown, any, unknown, any> | ArrayColumn<ColumnSchemaConfig<orchid_core.ColumnTypeBase<orchid_core.ColumnTypeSchemaArg, unknown, any, orchid_core.CoreBaseOperators, unknown, unknown, any, unknown, any, orchid_core.ColumnDataBase>>, ColumnType<orchid_core.ColumnTypeSchemaArg, unknown, any, pqb.BaseOperators, unknown, unknown, any, unknown, any>, unknown, unknown, unknown>;
 declare const tableToAst: (ctx: StructureToAstCtx, data: IntrospectedStructure, table: DbStructure.Table, action: 'create' | 'drop', domains: DbStructureDomainsMap) => RakeDbAst.Table;
@@ -1683,7 +1685,7 @@ declare const primaryKeyToSql: (primaryKey: Exclude<TableData['primaryKey'], und
 /**
  * Type of {@link rakeDb} function
  */
-type RakeDbFn = (<SchemaConfig extends ColumnSchemaConfig, CT>(options: MaybeArray<AdapterOptions>, partialConfig?: InputRakeDbConfig<SchemaConfig, CT>, args?: string[]) => RakeDbFnReturns<CT>) & {
+type RakeDbFn = (<SchemaConfig extends ColumnSchemaConfig, CT>(options: MaybeArray<AdapterOptions>, partialConfig: InputRakeDbConfig<SchemaConfig, CT>, args?: string[]) => RakeDbFnReturns<CT>) & {
     /**
      * Unlike the original `rakeDb` that executes immediately,
      * `rakeDb.lazy` returns the `run` function to be later called programmatically.
@@ -1705,7 +1707,7 @@ interface RakeDbResult {
 /**
  * Type of {@link rakeDb.lazy} function
  */
-type RakeDbLazyFn = <SchemaConfig extends ColumnSchemaConfig, CT>(options: MaybeArray<AdapterOptions>, partialConfig?: InputRakeDbConfig<SchemaConfig, CT>) => {
+type RakeDbLazyFn = <SchemaConfig extends ColumnSchemaConfig, CT>(options: MaybeArray<AdapterOptions>, partialConfig: InputRakeDbConfig<SchemaConfig, CT>) => {
     change: RakeDbChangeFn<CT>;
     run(args: string[], config?: Partial<RakeDbConfig<SchemaConfig, CT>>): Promise<RakeDbResult>;
 };

package/dist/index.js

@@ -3089,15 +3089,6 @@ const migrationConfigDefaults = {
   migrationsTable: "schemaMigrations",
   snakeCase: false,
   commands: {},
-  import: (path2) => {
-    return import(path2).catch((err) => {
-      if (err.code === "ERR_UNKNOWN_FILE_EXTENSION") {
-        require(path2);
-      } else {
-        throw err;
-      }
-    });
-  },
   log: true,
   logger: console
 };
@@ -4041,7 +4032,7 @@ const makeStructureToAstCtx = (config, currentSchema) => ({
   columnSchemaConfig: config.schemaConfig,
   columnsByType: pqb.makeColumnsByType(config.schemaConfig)
 });
-const structureToAst = async (ctx, adapter) => {
+const structureToAst = async (ctx, adapter, config) => {
   const ast = [];
   const data = await introspectDbSchema(adapter);
   for (const name of data.schemas) {
@@ -4063,7 +4054,7 @@ const structureToAst = async (ctx, adapter) => {
   }
   const domains = makeDomainsMap(ctx, data);
   for (const table of data.tables) {
-    if (table.name === "schemaMigrations")
+    if (table.name === config.migrationsTable)
       continue;
     ast.push(tableToAst(ctx, data, table, "create", domains));
   }
@@ -5162,7 +5153,7 @@ const pullDbStructure = async (options, config) => {
   const adapter = new pqb.Adapter(options);
   const currentSchema = adapter.schema || "public";
   const ctx = makeStructureToAstCtx(config, currentSchema);
-  const ast = await structureToAst(ctx, adapter);
+  const ast = await structureToAst(ctx, adapter, config);
   await adapter.close();
   const result = astToMigration(currentSchema, config, ast);
   if (!result)
@@ -5525,7 +5516,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-const rakeDb = (options, partialConfig = {}, args = process.argv.slice(2)) => {
+const rakeDb = (options, partialConfig, args = process.argv.slice(2)) => {
   const config = processRakeDbConfig(partialConfig);
   const promise = runCommand(
     options,
@@ -5543,7 +5534,7 @@ const rakeDb = (options, partialConfig = {}, args = process.argv.slice(2)) => {
     promise
   });
 };
-rakeDb.lazy = (options, partialConfig = {}) => {
+rakeDb.lazy = (options, partialConfig) => {
   const config = processRakeDbConfig(partialConfig);
   return {
     change,