rake-db 2.3.5 → 2.3.8

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # rake-db
 
+## 2.3.8
+
+### Patch Changes
+
+- Updated dependencies
+  - pqb@0.9.6
+
+## 2.3.7
+
+### Patch Changes
+
+- Mix query builder into migration db interface
+- Updated dependencies
+  - pqb@0.9.5
+
+## 2.3.6
+
+### Patch Changes
+
+- Improve esm support
+- Updated dependencies
+  - pqb@0.9.4
+
 ## 2.3.5
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as pqb from 'pqb';
-import { EmptyObject, RawExpression, ColumnType, ColumnTypes, raw, ColumnsShape, TransactionAdapter, AdapterOptions, QueryLogObject, QueryResultRow, QueryInput, TypeParsers, QueryResult, QueryArraysResult, MaybeArray, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, QueryLogOptions } from 'pqb';
+import { EmptyObject, RawExpression, ColumnType, ColumnTypes, raw, ColumnsShape, DbResult, columnTypes, TransactionAdapter, AdapterOptions, TextColumn, MaybeArray, IndexColumnOptions, IndexOptions, ForeignKeyOptions, QueryLogObject, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, QueryLogOptions } from 'pqb';
 
 declare function add(item: ColumnType, options?: {
     dropMode?: DropMode;
@@ -60,15 +60,222 @@ declare type ExtensionOptions = {
     version?: string;
     cascade?: boolean;
 };
-declare class Migration extends TransactionAdapter {
+declare type Migration = DbResult<typeof columnTypes> & MigrationBase;
+declare const createMigrationInterface: (tx: TransactionAdapter, up: boolean, options: RakeDbConfig, adapterOptions: AdapterOptions, appCodeUpdaterCache: object) => pqb.Db<string, Record<string, never>, pqb.RelationsBase, {
+    smallint: () => pqb.SmallIntColumn;
+    integer: () => pqb.IntegerColumn;
+    bigint: () => pqb.BigIntColumn;
+    numeric: <Precision extends number | undefined = undefined, Scale extends number | undefined = undefined>(precision?: Precision | undefined, scale?: Scale | undefined) => pqb.DecimalColumn<Precision, Scale>;
+    decimal: <Precision_1 extends number | undefined = undefined, Scale_1 extends number | undefined = undefined>(precision?: Precision_1 | undefined, scale?: Scale_1 | undefined) => pqb.DecimalColumn<Precision_1, Scale_1>;
+    real: () => pqb.RealColumn;
+    doublePrecision: () => pqb.DoublePrecisionColumn;
+    smallSerial: () => pqb.SmallSerialColumn;
+    serial: () => pqb.SerialColumn;
+    bigSerial: () => pqb.BigSerialColumn;
+    money: () => pqb.MoneyColumn;
+    varchar: <Limit extends number | undefined = undefined>(limit?: Limit | undefined) => pqb.VarCharColumn<Limit>;
+    char: <Limit_1 extends number | undefined = undefined>(limit?: Limit_1 | undefined) => pqb.CharColumn<Limit_1>;
+    text: (min: number, max: number) => TextColumn;
+    string: (min: number, max: number) => TextColumn;
+    bytea: () => pqb.ByteaColumn;
+    date: () => pqb.DateColumn;
+    timestamp: <Precision_2 extends number | undefined = undefined>(precision?: Precision_2 | undefined) => pqb.TimestampColumn<Precision_2>;
+    timestampWithTimeZone: <Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined) => pqb.TimestampWithTimeZoneColumn<Precision_3>;
+    time: <Precision_4 extends number | undefined = undefined>(precision?: Precision_4 | undefined) => pqb.TimeColumn<Precision_4>;
+    timeWithTimeZone: <Precision_5 extends number | undefined = undefined>(precision?: Precision_5 | undefined) => pqb.TimeWithTimeZoneColumn<Precision_5>;
+    interval: <Fields extends string | undefined = undefined, Precision_6 extends number | undefined = undefined>(fields?: Fields | undefined, precision?: Precision_6 | undefined) => pqb.IntervalColumn<Fields, Precision_6>;
+    boolean: () => pqb.BooleanColumn;
+    enum: <U extends string, T extends [U, ...U[]]>(dataType: string, type: T) => pqb.EnumColumn<U, T>;
+    point: () => pqb.PointColumn;
+    line: () => pqb.LineColumn;
+    lseg: () => pqb.LsegColumn;
+    box: () => pqb.BoxColumn;
+    path: () => pqb.PathColumn;
+    polygon: () => pqb.PolygonColumn;
+    circle: () => pqb.CircleColumn;
+    cidr: () => pqb.CidrColumn;
+    inet: () => pqb.InetColumn;
+    macaddr: () => pqb.MacAddrColumn;
+    macaddr8: () => pqb.MacAddr8Column;
+    bit: <Length extends number>(length: Length) => pqb.BitColumn<Length>;
+    bitVarying: <Length_1 extends number | undefined = undefined>(length?: Length_1 | undefined) => pqb.BitVaryingColumn<Length_1>;
+    tsvector: () => pqb.TsVectorColumn;
+    tsquery: () => pqb.TsQueryColumn;
+    uuid: () => pqb.UUIDColumn;
+    xml: () => pqb.XMLColumn;
+    json: <Type extends pqb.JSONTypeAny>(schemaOrFn: Type | ((j: {
+        set: <Value extends pqb.JSONTypeAny>(valueType: Value) => pqb.JSONSet<Value>;
+        tuple: <T_1 extends [] | pqb.JSONTupleItems, Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
+        union: <T_2 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_2) => pqb.JSONUnion<T_2>;
+        any: () => pqb.JSONAny;
+        bigint: () => pqb.JSONBigInt;
+        boolean: () => pqb.JSONBoolean;
+        date: () => pqb.JSONDate;
+        nan: () => pqb.JSONNaN;
+        never: () => pqb.JSONNever;
+        null: () => pqb.JSONNull;
+        number: () => pqb.JSONNumber;
+        string: () => pqb.JSONString;
+        undefined: () => pqb.JSONUndefined;
+        unknown: () => pqb.JSONUnknown;
+        void: () => pqb.JSONVoid;
+        array: <Type_1 extends pqb.JSONTypeAny>(element: Type_1) => pqb.JSONArray<Type_1, "many">;
+        discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends pqb.Primitive, Types extends [pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => pqb.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types[number]>;
+        enum: <U_1 extends string, T_3 extends [U_1, ...U_1[]]>(options: T_3) => pqb.JSONEnum<U_1, T_3>;
+        instanceOf: <T_4 extends new (...args: any[]) => any>(cls: T_4) => pqb.JSONInstanceOf<T_4>;
+        intersection: <Left extends pqb.JSONTypeAny, Right extends pqb.JSONTypeAny>(left: Left, right: Right) => pqb.JSONIntersection<Left, Right>;
+        lazy: <T_5 extends pqb.JSONTypeAny>(fn: () => T_5) => pqb.JSONLazy<T_5>;
+        literal: <T_6 extends pqb.Primitive>(value: T_6) => pqb.JSONLiteral<T_6>;
+        map: <Key extends pqb.JSONTypeAny, Value_1 extends pqb.JSONTypeAny>(keyType: Key, valueType: Value_1) => pqb.JSONMap<Key, Value_1>;
+        nativeEnum: <T_7 extends pqb.EnumLike>(givenEnum: T_7) => pqb.JSONNativeEnum<T_7>;
+        nullable: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullable<T_8>;
+        nullish: <T_9 extends pqb.JSONTypeAny>(type: T_9) => pqb.JSONNullish<T_9>;
+        object: <T_10 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_10) => pqb.JSONObject<T_10, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
+            [k: string]: Catchall["type"];
+        } extends infer T_12 extends object ? { [k_2 in keyof T_12]: ((pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
+            [k: string]: Catchall["type"];
+        })[k_2]; } : never>;
+        optional: <T_13 extends pqb.JSONTypeAny>(type: T_13) => pqb.JSONOptional<T_13>;
+        record: typeof pqb.record;
+    }) => Type)) => pqb.JSONColumn<Type>;
+    jsonText: () => pqb.JSONTextColumn;
+    array: <Item extends ColumnType<unknown, pqb.Operators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
+    timestamps: <T_14 extends ColumnType<unknown, pqb.Operators, unknown>>(this: {
+        timestamp(): T_14;
+    }) => {
+        createdAt: T_14 & {
+            hasDefault: true;
+        };
+        updatedAt: T_14 & {
+            hasDefault: true;
+        };
+    };
+    primaryKey(columns: string[], options?: {
+        name?: string | undefined;
+    } | undefined): {};
+    index(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): {};
+    unique(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): {};
+    foreignKey: {
+        <Table extends pqb.ForeignKeyTableWithColumns, Columns extends [Exclude<keyof InstanceType<Table>["columns"]["shape"], number | symbol>, ...Exclude<keyof InstanceType<Table>["columns"]["shape"], number | symbol>[]]>(columns: string[], fn: () => Table, foreignColumns: Columns, options?: ForeignKeyOptions | undefined): {};
+        <Table_1 extends string, Columns_1 extends [string, ...string[]]>(columns: string[], table: Table_1, foreignColumns: Columns_1, options?: ForeignKeyOptions | undefined): {};
+    };
+}> & {
+    <Table_2 extends string, Shape extends ColumnsShape = ColumnsShape>(table: Table_2, shape?: Shape | ((t: {
+        smallint: () => pqb.SmallIntColumn;
+        integer: () => pqb.IntegerColumn;
+        bigint: () => pqb.BigIntColumn;
+        numeric: <Precision extends number | undefined = undefined, Scale extends number | undefined = undefined>(precision?: Precision | undefined, scale?: Scale | undefined) => pqb.DecimalColumn<Precision, Scale>;
+        decimal: <Precision_1 extends number | undefined = undefined, Scale_1 extends number | undefined = undefined>(precision?: Precision_1 | undefined, scale?: Scale_1 | undefined) => pqb.DecimalColumn<Precision_1, Scale_1>;
+        real: () => pqb.RealColumn;
+        doublePrecision: () => pqb.DoublePrecisionColumn;
+        smallSerial: () => pqb.SmallSerialColumn;
+        serial: () => pqb.SerialColumn;
+        bigSerial: () => pqb.BigSerialColumn;
+        money: () => pqb.MoneyColumn;
+        varchar: <Limit extends number | undefined = undefined>(limit?: Limit | undefined) => pqb.VarCharColumn<Limit>;
+        char: <Limit_1 extends number | undefined = undefined>(limit?: Limit_1 | undefined) => pqb.CharColumn<Limit_1>;
+        text: (min: number, max: number) => TextColumn;
+        string: (min: number, max: number) => TextColumn;
+        bytea: () => pqb.ByteaColumn;
+        date: () => pqb.DateColumn;
+        timestamp: <Precision_2 extends number | undefined = undefined>(precision?: Precision_2 | undefined) => pqb.TimestampColumn<Precision_2>;
+        timestampWithTimeZone: <Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined) => pqb.TimestampWithTimeZoneColumn<Precision_3>;
+        time: <Precision_4 extends number | undefined = undefined>(precision?: Precision_4 | undefined) => pqb.TimeColumn<Precision_4>;
+        timeWithTimeZone: <Precision_5 extends number | undefined = undefined>(precision?: Precision_5 | undefined) => pqb.TimeWithTimeZoneColumn<Precision_5>;
+        interval: <Fields extends string | undefined = undefined, Precision_6 extends number | undefined = undefined>(fields?: Fields | undefined, precision?: Precision_6 | undefined) => pqb.IntervalColumn<Fields, Precision_6>;
+        boolean: () => pqb.BooleanColumn;
+        enum: <U extends string, T extends [U, ...U[]]>(dataType: string, type: T) => pqb.EnumColumn<U, T>;
+        point: () => pqb.PointColumn;
+        line: () => pqb.LineColumn;
+        lseg: () => pqb.LsegColumn;
+        box: () => pqb.BoxColumn;
+        path: () => pqb.PathColumn;
+        polygon: () => pqb.PolygonColumn;
+        circle: () => pqb.CircleColumn;
+        cidr: () => pqb.CidrColumn;
+        inet: () => pqb.InetColumn;
+        macaddr: () => pqb.MacAddrColumn;
+        macaddr8: () => pqb.MacAddr8Column;
+        bit: <Length extends number>(length: Length) => pqb.BitColumn<Length>;
+        bitVarying: <Length_1 extends number | undefined = undefined>(length?: Length_1 | undefined) => pqb.BitVaryingColumn<Length_1>;
+        tsvector: () => pqb.TsVectorColumn;
+        tsquery: () => pqb.TsQueryColumn;
+        uuid: () => pqb.UUIDColumn;
+        xml: () => pqb.XMLColumn;
+        json: <Type extends pqb.JSONTypeAny>(schemaOrFn: Type | ((j: {
+            set: <Value extends pqb.JSONTypeAny>(valueType: Value) => pqb.JSONSet<Value>;
+            tuple: <T_1 extends [] | pqb.JSONTupleItems, Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
+            union: <T_2 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_2) => pqb.JSONUnion<T_2>;
+            any: () => pqb.JSONAny;
+            bigint: () => pqb.JSONBigInt;
+            boolean: () => pqb.JSONBoolean;
+            date: () => pqb.JSONDate;
+            nan: () => pqb.JSONNaN;
+            never: () => pqb.JSONNever;
+            null: () => pqb.JSONNull;
+            number: () => pqb.JSONNumber;
+            string: () => pqb.JSONString;
+            undefined: () => pqb.JSONUndefined;
+            unknown: () => pqb.JSONUnknown;
+            void: () => pqb.JSONVoid;
+            array: <Type_1 extends pqb.JSONTypeAny>(element: Type_1) => pqb.JSONArray<Type_1, "many">;
+            discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends pqb.Primitive, Types extends [pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => pqb.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types[number]>;
+            enum: <U_1 extends string, T_3 extends [U_1, ...U_1[]]>(options: T_3) => pqb.JSONEnum<U_1, T_3>;
+            instanceOf: <T_4 extends new (...args: any[]) => any>(cls: T_4) => pqb.JSONInstanceOf<T_4>;
+            intersection: <Left extends pqb.JSONTypeAny, Right extends pqb.JSONTypeAny>(left: Left, right: Right) => pqb.JSONIntersection<Left, Right>;
+            lazy: <T_5 extends pqb.JSONTypeAny>(fn: () => T_5) => pqb.JSONLazy<T_5>;
+            literal: <T_6 extends pqb.Primitive>(value: T_6) => pqb.JSONLiteral<T_6>;
+            map: <Key extends pqb.JSONTypeAny, Value_1 extends pqb.JSONTypeAny>(keyType: Key, valueType: Value_1) => pqb.JSONMap<Key, Value_1>;
+            nativeEnum: <T_7 extends pqb.EnumLike>(givenEnum: T_7) => pqb.JSONNativeEnum<T_7>;
+            nullable: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullable<T_8>;
+            nullish: <T_9 extends pqb.JSONTypeAny>(type: T_9) => pqb.JSONNullish<T_9>;
+            object: <T_10 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_10) => pqb.JSONObject<T_10, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
+                [k: string]: Catchall["type"];
+            } extends infer T_12 extends object ? { [k_2 in keyof T_12]: ((pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
+                [k: string]: Catchall["type"];
+            })[k_2]; } : never>;
+            optional: <T_13 extends pqb.JSONTypeAny>(type: T_13) => pqb.JSONOptional<T_13>;
+            record: typeof pqb.record;
+        }) => Type)) => pqb.JSONColumn<Type>;
+        jsonText: () => pqb.JSONTextColumn;
+        array: <Item extends ColumnType<unknown, pqb.Operators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
+        timestamps: <T_14 extends ColumnType<unknown, pqb.Operators, unknown>>(this: {
+            timestamp(): T_14;
+        }) => {
+            createdAt: T_14 & {
+                hasDefault: true;
+            };
+            updatedAt: T_14 & {
+                hasDefault: true;
+            };
+        };
+        primaryKey(columns: string[], options?: {
+            name?: string | undefined;
+        } | undefined): {};
+        index(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): {};
+        unique(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): {};
+        foreignKey: {
+            <Table extends pqb.ForeignKeyTableWithColumns, Columns extends [Exclude<keyof InstanceType<Table>["columns"]["shape"], number | symbol>, ...Exclude<keyof InstanceType<Table>["columns"]["shape"], number | symbol>[]]>(columns: string[], fn: () => Table, foreignColumns: Columns, options?: ForeignKeyOptions | undefined): {};
+            <Table_1 extends string, Columns_1 extends [string, ...string[]]>(columns: string[], table: Table_1, foreignColumns: Columns_1, options?: ForeignKeyOptions | undefined): {};
+        };
+    }) => Shape) | undefined, options?: pqb.DbTableOptions | undefined): pqb.Db<Table_2, Shape, pqb.RelationsBase, pqb.ColumnTypesBase>;
+    adapter: pqb.Adapter;
+    close: () => Promise<void>;
+} & MigrationBase & {
+    adapter: TransactionAdapter;
+    log: QueryLogObject | undefined;
     up: boolean;
     options: RakeDbConfig;
     adapterOptions: AdapterOptions;
     appCodeUpdaterCache: object;
+};
+declare class MigrationBase {
+    adapter: TransactionAdapter;
     log?: QueryLogObject;
-    constructor(tx: TransactionAdapter, up: boolean, options: RakeDbConfig, adapterOptions: AdapterOptions, appCodeUpdaterCache: object);
-    query<T extends QueryResultRow = any>(query: QueryInput, types?: TypeParsers, log?: QueryLogObject | undefined): Promise<QueryResult<T>>;
-    arrays<R extends any[] = any[]>(query: QueryInput, types?: TypeParsers, log?: QueryLogObject | undefined): Promise<QueryArraysResult<R>>;
+    up: boolean;
+    options: RakeDbConfig;
+    adapterOptions: AdapterOptions;
+    appCodeUpdaterCache: object;
     createTable(tableName: string, options: TableOptions, fn: ColumnsShapeCallback): Promise<void>;
     createTable(tableName: string, fn: ColumnsShapeCallback): Promise<void>;
     dropTable(tableName: string, options: TableOptions, fn: ColumnsShapeCallback): Promise<void>;
@@ -102,7 +309,7 @@ declare class Migration extends TransactionAdapter {
     columnExists(tableName: string, columnName: string): Promise<boolean>;
     constraintExists(constraintName: string): Promise<boolean>;
 }
-declare const runCodeUpdater: (migration: Migration, ast: RakeDbAst) => Promise<void> | undefined;
+declare const runCodeUpdater: (migration: MigrationBase, ast: RakeDbAst) => Promise<void> | undefined;
 
 declare type RakeDbAst = RakeDbAst.Table | RakeDbAst.ChangeTable | RakeDbAst.RenameTable | RakeDbAst.Schema | RakeDbAst.Extension;
 declare namespace RakeDbAst {
@@ -185,7 +392,7 @@ declare namespace RakeDbAst {
 declare type RakeDbConfig = {
     migrationsPath: string;
     migrationsTable: string;
-    requireTs(path: string): void;
+    requireTs(path: string): Promise<void>;
     noPrimaryKey?: NoPrimaryKeyOption;
     appCodeUpdater?: AppCodeUpdater;
     useCodeUpdater?: boolean;
@@ -211,4 +418,4 @@ declare const change: (fn: ChangeCallback) => void;
 
 declare const rakeDb: (options: MaybeArray<AdapterOptions>, partialConfig?: Partial<RakeDbConfig>, args?: string[]) => Promise<void>;
 
-export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, ExtensionOptions, JoinTableOptions, Migration, MigrationColumnTypes, RakeDbAst, RakeDbConfig, TableOptions, change, createDb, dropDb, generate, migrate, rakeDb, resetDb, rollback, runCodeUpdater, writeMigrationFile };
+export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, ExtensionOptions, JoinTableOptions, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, TableOptions, change, createDb, createMigrationInterface, dropDb, generate, migrate, rakeDb, resetDb, rollback, runCodeUpdater, writeMigrationFile };

package/dist/index.js

@@ -9,6 +9,24 @@ var promises = require('fs/promises');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+function _interopNamespace(e) {
+  if (e && e.__esModule) return 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 Enquirer__default = /*#__PURE__*/_interopDefaultLegacy(Enquirer);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
@@ -34,7 +52,7 @@ var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const migrationConfigDefaults = {
   migrationsPath: path__default["default"].resolve("src", "migrations"),
   migrationsTable: "schemaMigrations",
-  requireTs: require,
+  requireTs: (path2) => (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(path2),
   log: true,
   logger: console,
   useCodeUpdater: true
@@ -436,7 +454,7 @@ const createTable$1 = async (migration, up, tableName, options, fn) => {
   validatePrimaryKey(ast);
   const queries = astToQueries$1(ast);
   for (const query of queries) {
-    await migration.query(query);
+    await migration.adapter.query(query);
   }
   await runCodeUpdater(migration, ast);
 };
@@ -670,7 +688,7 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   const ast = makeAst(up, tableName, changeData, changeTableData, options);
   const queries = astToQueries(ast);
   for (const query of queries) {
-    await migration.query(query);
+    await migration.adapter.query(query);
   }
   await runCodeUpdater(migration, ast);
 };
@@ -899,21 +917,31 @@ var __spreadValues$2 = (a, b) => {
   return a;
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
-class Migration extends pqb.TransactionAdapter {
-  constructor(tx, up, options, adapterOptions, appCodeUpdaterCache) {
-    super(tx, tx.client, tx.types);
-    this.up = up;
-    this.options = options;
-    this.adapterOptions = adapterOptions;
-    this.appCodeUpdaterCache = appCodeUpdaterCache;
-    this.log = pqb.logParamToLogObject(options.logger || console, options.log);
-  }
-  async query(query, types = this.types, log = this.log) {
-    return wrapWithLog(log, query, () => super.query(query, types));
-  }
-  async arrays(query, types = this.types, log = this.log) {
-    return wrapWithLog(log, query, () => super.arrays(query, types));
-  }
+const createMigrationInterface = (tx, up, options, adapterOptions, appCodeUpdaterCache) => {
+  const adapter = new pqb.TransactionAdapter(tx, tx.client, tx.types);
+  const { query, arrays } = adapter;
+  const log = pqb.logParamToLogObject(options.logger || console, options.log);
+  adapter.query = (q, types) => {
+    return wrapWithLog(log, q, () => query.call(adapter, q, types));
+  };
+  adapter.arrays = (q, types) => {
+    return wrapWithLog(log, q, () => arrays.call(adapter, q, types));
+  };
+  const db = pqb.createDb({ adapter, columnTypes: pqb.columnTypes });
+  const { prototype: proto } = MigrationBase;
+  for (const key of Object.getOwnPropertyNames(proto)) {
+    db[key] = proto[key];
+  }
+  return Object.assign(db, {
+    adapter,
+    log,
+    up,
+    options,
+    adapterOptions,
+    appCodeUpdaterCache
+  });
+};
+class MigrationBase {
   createTable(tableName, cbOrOptions, cb) {
     const options = typeof cbOrOptions === "function" ? {} : cbOrOptions;
     const fn = cb || cbOrOptions;
@@ -938,7 +966,7 @@ class Migration extends pqb.TransactionAdapter {
       toSchema,
       to: t
     };
-    await this.query(
+    await this.adapter.query(
       `ALTER TABLE ${quoteWithSchema({
         schema: ast.fromSchema,
         name: ast.from
@@ -1061,7 +1089,7 @@ const createSchema$1 = async (migration, up, name) => {
     action: up ? "create" : "drop",
     name
   };
-  await migration.query(
+  await migration.adapter.query(
     `${ast.action === "create" ? "CREATE" : "DROP"} SCHEMA "${name}"`
   );
   await runCodeUpdater(migration, ast);
@@ -1078,11 +1106,11 @@ const createExtension = async (migration, up, name, options) => {
   } else {
     query = `CREATE EXTENSION${ast.ifExists ? " IF NOT EXISTS" : ""} "${ast.name}"${ast.schema ? ` SCHEMA "${ast.schema}"` : ""}${ast.version ? ` VERSION '${ast.version}'` : ""}${ast.cascade ? " CASCADE" : ""}`;
   }
-  await migration.query(query);
+  await migration.adapter.query(query);
   await runCodeUpdater(migration, ast);
 };
 const queryExists = (db, sql) => {
-  return db.query(sql).then(({ rowCount }) => rowCount > 0);
+  return db.adapter.query(sql).then(({ rowCount }) => rowCount > 0);
 };
 const runCodeUpdater = (migration, ast) => {
   var _a, _b;
@@ -1149,19 +1177,25 @@ const migrateOrRollback = async (options, config, args, up) => {
 const changeCache = {};
 const processMigration = async (db, up, file, config, options, appCodeUpdaterCache) => {
   await db.transaction(async (tx) => {
-    const db2 = new Migration(tx, up, config, options, appCodeUpdaterCache);
+    const db2 = createMigrationInterface(
+      tx,
+      up,
+      config,
+      options,
+      appCodeUpdaterCache
+    );
     setCurrentMigration(db2);
     setCurrentMigrationUp(up);
     const callback = changeCache[file.path];
     if (callback) {
       change(callback);
     } else {
-      config.requireTs(file.path);
+      await config.requireTs(file.path);
       changeCache[file.path] = getCurrentChangeCallback();
     }
     await getCurrentPromise();
     await (up ? saveMigratedVersion : removeMigratedVersion)(
-      db2,
+      db2.adapter,
       file.version,
       config
     );
@@ -1950,9 +1984,10 @@ Generate arguments:
 `
 );
 
-exports.Migration = Migration;
+exports.MigrationBase = MigrationBase;
 exports.change = change;
 exports.createDb = createDb;
+exports.createMigrationInterface = createMigrationInterface;
 exports.dropDb = dropDb;
 exports.generate = generate;
 exports.migrate = migrate;