drizzle-orm 0.12.0-beta.0 → 0.12.0-beta.10

package/alias.d.ts

@@ -0,0 +1,12 @@
+import { AnyColumn } from './column';
+import { Table } from './table';
+export declare class ColumnAliasProxyHandler<TColumn extends AnyColumn> implements ProxyHandler<TColumn> {
+    private table;
+    constructor(table: Table);
+    get(columnObj: TColumn, prop: string | symbol, receiver: any): any;
+}
+export declare class TableAliasProxyHandler implements ProxyHandler<Table> {
+    private alias;
+    constructor(alias: string);
+    get(tableObj: Table, prop: string | symbol, receiver: any): any;
+}

package/alias.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TableAliasProxyHandler = exports.ColumnAliasProxyHandler = void 0;
+const column_1 = require("./column");
+const table_1 = require("./table");
+class ColumnAliasProxyHandler {
+    constructor(table) {
+        this.table = table;
+    }
+    get(columnObj, prop, receiver) {
+        if (prop === 'table') {
+            return this.table;
+        }
+        return columnObj[prop];
+    }
+}
+exports.ColumnAliasProxyHandler = ColumnAliasProxyHandler;
+class TableAliasProxyHandler {
+    constructor(alias) {
+        this.alias = alias;
+    }
+    get(tableObj, prop, receiver) {
+        if (prop === table_1.Table.Symbol.Name) {
+            return this.alias;
+        }
+        if (prop === table_1.Table.Symbol.Columns) {
+            const columns = tableObj[table_1.Table.Symbol.Columns];
+            if (!columns) {
+                return columns;
+            }
+            const proxiedColumns = {};
+            Object.keys(columns).map((key) => {
+                proxiedColumns[key] = new Proxy(columns[key], new ColumnAliasProxyHandler(new Proxy(tableObj, this)));
+            });
+            return proxiedColumns;
+        }
+        const value = tableObj[prop];
+        if (value instanceof column_1.Column) {
+            return new Proxy(value, new ColumnAliasProxyHandler(new Proxy(tableObj, this)));
+        }
+        return value;
+    }
+}
+exports.TableAliasProxyHandler = TableAliasProxyHandler;
+//# sourceMappingURL=alias.js.map

package/alias.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"alias.js","sourceRoot":"","sources":["../src/alias.ts"],"names":[],"mappings":";;;AAAA,qCAA6C;AAC7C,mCAAgC;AAEhC,MAAa,uBAAuB;IACnC,YAA2B,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;IAAG,CAAC;IAEpC,GAAG,CAAC,SAAkB,EAAE,IAAqB,EAAE,QAAa;QAClE,IAAI,IAAI,KAAK,OAAO,EAAE;YACrB,OAAO,IAAI,CAAC,KAAK,CAAC;SAClB;QACD,OAAO,SAAS,CAAC,IAAqB,CAAC,CAAC;IACzC,CAAC;CACD;AATD,0DASC;AAED,MAAa,sBAAsB;IAClC,YAA2B,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAAG,CAAC;IAErC,GAAG,CAAC,QAAe,EAAE,IAAqB,EAAE,QAAa;QAC/D,IAAI,IAAI,KAAK,aAAK,CAAC,MAAM,CAAC,IAAI,EAAE;YAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;SAClB;QACD,IAAI,IAAI,KAAK,aAAK,CAAC,MAAM,CAAC,OAAO,EAAE;YAClC,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,OAAO,CAAC;aACf;YAED,MAAM,cAAc,GAA2B,EAAE,CAAC;YAElD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBAChC,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,CAC9B,OAAO,CAAC,GAAG,CAAE,EACb,IAAI,uBAAuB,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CACtD,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,cAAc,CAAC;SACtB;QAED,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAmB,CAAC,CAAC;QAC5C,IAAI,KAAK,YAAY,eAAM,EAAE;YAC5B,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,uBAAuB,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;SAChF;QAED,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAhCD,wDAgCC"}

package/column-builder.d.ts

@@ -1,14 +1,34 @@
-import { ColumnData, ColumnDriverParam, ColumnHasDefault, ColumnNotNull, Unwrap } from './branded-types';
-import { AnySQL } from './sql';
-export declare abstract class ColumnBuilder<TData extends ColumnData, TDriverParam extends ColumnDriverParam, TNotNull extends ColumnNotNull<boolean>, THasDefault extends ColumnHasDefault<boolean>> {
-    protected typeKeeper: {
-        brand: 'ColumnBuilder';
-        dataType: TData;
-        notNull: TNotNull;
-        default: THasDefault;
+import { SQL } from './sql';
+import { Update } from './utils';
+export interface ColumnBuilderBaseConfig {
+    data: unknown;
+    driverParam: unknown;
+    notNull: boolean;
+    hasDefault: boolean;
+}
+export declare type ColumnBuilderConfig<TPartial extends Partial<ColumnBuilderBaseConfig> = {}> = Update<ColumnBuilderBaseConfig & {
+    notNull: false;
+    hasDefault: false;
+}, TPartial>;
+export declare abstract class ColumnBuilder<T extends Partial<ColumnBuilderBaseConfig>> {
+    protected $brand: {
+        type: 'ColumnBuilder';
+        subtype: string;
     };
+    protected $config: T;
+    protected $data: T['data'];
+    protected $driverParam: T['driverParam'];
+    protected $notNull: T['notNull'];
+    protected $hasDefault: T['hasDefault'];
     constructor(name: string);
-    notNull(): ColumnBuilder<TData, TDriverParam, ColumnNotNull<true>, THasDefault>;
-    default(value: Unwrap<TData> | AnySQL): ColumnBuilder<TData, TDriverParam, TNotNull, ColumnHasDefault<true>>;
-    primaryKey(): ColumnBuilder<TData, TDriverParam, ColumnNotNull<true>, THasDefault>;
+    notNull(): ColumnBuilder<UpdateCBConfig<T, {
+        notNull: true;
+    }>>;
+    default(value: T['data'] | SQL): ColumnBuilder<UpdateCBConfig<T, {
+        hasDefault: true;
+    }>>;
+    primaryKey(): ColumnBuilder<UpdateCBConfig<T, {
+        notNull: true;
+    }>>;
 }
+export declare type UpdateCBConfig<T extends Partial<ColumnBuilderBaseConfig>, TUpdate extends Partial<ColumnBuilderBaseConfig>> = Update<T, TUpdate>;

package/column-builder.js

@@ -1,22 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColumnBuilder = void 0;
+// To understand how to use `ColumnBuilder` and `AnyColumnBuilder`, see `Column` and `AnyColumn` documentation.
 class ColumnBuilder {
     constructor(name) {
-        /** @internal */ this._notNull = false;
-        /** @internal */ this._primaryKey = false;
-        this.name = name;
+        this.config = {
+            name,
+            notNull: false,
+            default: undefined,
+            primaryKey: false,
+        };
     }
     notNull() {
-        this._notNull = true;
+        this.config.notNull = true;
         return this;
     }
     default(value) {
-        this._default = value;
+        this.config.default = value;
         return this;
     }
     primaryKey() {
-        this._primaryKey = true;
+        this.config.primaryKey = true;
         return this;
     }
 }

package/column-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"column-builder.js","sourceRoot":"","sources":["../src/column-builder.ts"],"names":[],"mappings":";;;AAKA,MAAsB,aAAa;IAmBlC,YAAY,IAAY;QANxB,gBAAgB,CAAC,aAAQ,GAAG,KAAiB,CAAC;QAG9C,gBAAgB,CAAC,gBAAW,GAAG,KAAK,CAAC;QAIpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,CAAC;IAED,OAAO;QACN,IAAI,CAAC,QAAQ,GAAG,IAAgB,CAAC;QACjC,OAAO,IAAW,CAAC;IACpB,CAAC;IAED,OAAO,CACN,KAA6B;QAE7B,IAAI,CAAC,QAAQ,GAAG,KAAc,CAAC;QAC/B,OAAO,IAAW,CAAC;IACpB,CAAC;IAED,UAAU;QACT,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,OAAO,IAAW,CAAC;IACpB,CAAC;CAMD;AA5CD,sCA4CC"}
+{"version":3,"file":"column-builder.js","sourceRoot":"","sources":["../src/column-builder.ts"],"names":[],"mappings":";;;AAkBA,+GAA+G;AAC/G,MAAsB,aAAa;IAmBlC,YAAY,IAAY;QACvB,IAAI,CAAC,MAAM,GAAG;YACb,IAAI;YACJ,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,SAAS;YAClB,UAAU,EAAE,KAAK;SACjB,CAAC;IACH,CAAC;IAED,OAAO;QACN,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;QAC3B,OAAO,IAAmC,CAAC;IAC5C,CAAC;IAED,OAAO,CACN,KAAsB;QAEtB,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC;QAC5B,OAAO,IAAmC,CAAC;IAC5C,CAAC;IAED,UAAU;QACT,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QAC9B,OAAO,IAAsC,CAAC;IAC/C,CAAC;CACD;AA5CD,sCA4CC"}

package/column.d.ts

@@ -1,37 +1,43 @@
-import { ColumnData, ColumnDriverParam, ColumnHasDefault, ColumnNotNull, TableName, Unwrap } from './branded-types';
-import { ColumnBuilder } from './column-builder';
-import { BoundParamValue, ParamValueMapper } from './sql';
-import { AnyTable } from './table';
-export declare abstract class Column<TTableName extends TableName<string>, TData extends ColumnData, TDriverParam extends ColumnDriverParam, TNotNull extends ColumnNotNull<boolean>, THasDefault extends ColumnHasDefault<boolean>> implements ParamValueMapper<any, any> {
-    readonly table: AnyTable<TTableName>;
-    protected typeKeeper: {
-        brand: 'Column';
-        tableName: TTableName;
-        type: TData;
-        driverType: TDriverParam;
-        notNull: TNotNull;
-        default: THasDefault;
-    };
+import { ColumnBuilder, ColumnBuilderBaseConfig, ColumnBuilderConfig } from './column-builder';
+import { DriverValueMapper, SQL } from './sql';
+import { Table } from './table';
+import { Update } from './utils';
+export interface ColumnBaseConfig extends ColumnBuilderBaseConfig {
+    tableName: string;
+}
+export declare type ColumnConfig<TPartial extends Partial<ColumnBaseConfig> = {}> = Update<ColumnBuilderConfig & {
+    tableName: string;
+}, TPartial>;
+export declare abstract class Column<T extends Partial<ColumnBaseConfig>> implements DriverValueMapper<T['data'], T['driverParam']> {
+    readonly table: Table<T['tableName']>;
+    protected $brand: 'Column';
+    protected $config: T;
+    protected $data: T['data'];
+    protected $driverParam: T['driverParam'];
+    protected $notNull: T['notNull'];
+    protected $hasDefault: T['hasDefault'];
     readonly name: string;
     readonly primary: boolean;
-    readonly notNull: TNotNull;
-    readonly default: TData | undefined;
-    constructor(table: AnyTable<TTableName>, builder: ColumnBuilder<TData, TDriverParam, TNotNull, THasDefault>);
-    mapFromDriverValue: (value: any) => any;
-    mapToDriverValue: (value: any) => any;
+    readonly notNull: boolean;
+    readonly default: T['data'] | SQL | undefined;
+    constructor(table: Table<T['tableName']>, builder: ColumnBuilder<Omit<T, 'tableName'>>);
     abstract getSQLType(): string;
+    mapFromDriverValue(value: T['driverParam']): T['data'];
+    mapToDriverValue(value: T['data']): T['driverParam'];
 }
-export declare abstract class ColumnWithMapper<TTableName extends TableName<string>, TData extends ColumnData, TDriverParam extends ColumnDriverParam, TNotNull extends ColumnNotNull<boolean>, THasDefault extends ColumnHasDefault<boolean>> extends Column<TTableName, TData, TDriverParam, TNotNull, THasDefault> implements ParamValueMapper<TData, TDriverParam> {
-    mapFromDriverValue: (value: Unwrap<TDriverParam>) => Unwrap<TData>;
-    mapToDriverValue: (value: Unwrap<TData>) => Unwrap<TDriverParam>;
-}
-export declare type AnyColumn<TTableName extends TableName = TableName, TData extends ColumnData = any, TDriverParam extends ColumnDriverParam = any, TNotNull extends ColumnNotNull = ColumnNotNull, THasDefault extends ColumnHasDefault = ColumnHasDefault> = Column<TTableName, TData, TDriverParam, TNotNull, THasDefault>;
-export declare type AnyColumnWithMapper<TTableName extends TableName = TableName, TData extends ColumnData = any, TDriverParam extends ColumnDriverParam = any, TNotNull extends ColumnNotNull = ColumnNotNull, THasDefault extends ColumnHasDefault = ColumnHasDefault> = ColumnWithMapper<TTableName, TData, TDriverParam, TNotNull, THasDefault>;
-export declare function param<TDataType extends ColumnData, TDriverType extends ColumnDriverParam>(column: AnyColumn<any, TDataType, TDriverType>, value: Unwrap<TDataType>): BoundParamValue<TDataType, TDriverType>;
-export declare type GetColumnData<TColumn, TInferMode extends 'query' | 'raw' = 'query'> = TColumn extends Column<any, infer TData, any, infer TNotNull, any> ? TInferMode extends 'raw' ? Unwrap<TData> : TNotNull extends true ? Unwrap<TData> : Unwrap<TData> | null : never;
-export declare type InferColumnDriverParam<TColumn extends AnyColumn> = TColumn extends Column<TableName, ColumnData, infer TDriverType, ColumnNotNull, ColumnHasDefault> ? Unwrap<TDriverType> : never;
+export declare type UpdateColConfig<T extends Partial<ColumnBaseConfig>, TUpdate extends Partial<ColumnBaseConfig>> = Update<T, TUpdate>;
+export declare type AnyColumn<TPartial extends Partial<ColumnBaseConfig> = {}> = Column<Update<ColumnBaseConfig, TPartial>>;
+export declare type GetColumnData<TColumn extends AnyColumn, TInferMode extends 'query' | 'raw' = 'query'> = TColumn extends AnyColumn<{
+    data: infer TData;
+    notNull: infer TNotNull extends boolean;
+}> ? TInferMode extends 'raw' ? TData : TNotNull extends true ? TData : TData | null : never;
+/**
+    `GetColumnConfig` can be used to infer either the full config of the column or a single parameter.
+    @example
+    type TConfig = GetColumnConfig<typeof column>;
+    type TNotNull = GetColumnConfig<typeof column, 'notNull'>;
+*/
+export declare type GetColumnConfig<TColumn extends AnyColumn, TParam extends keyof ColumnBaseConfig | undefined = undefined> = TColumn extends Column<infer TConfig> ? TParam extends keyof ColumnBaseConfig ? TConfig[TParam] : TConfig : never;
 export declare type InferColumnsDataTypes<TColumns extends Record<string, AnyColumn>> = {
     [Key in keyof TColumns]: GetColumnData<TColumns[Key], 'query'>;
 };
-export declare type InferColumnTable<T extends AnyColumn> = T extends AnyColumn<infer TTable> ? TTable : never;
-export declare type ChangeColumnTable<TColumn extends AnyColumn, TTableName extends TableName> = TColumn extends Column<any, infer TType, infer TDriverType, infer TNotNull, infer THasDefault> ? ColumnWithMapper<TTableName, TType, TDriverType, TNotNull, THasDefault> : never;

package/column.js

@@ -1,41 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.param = exports.ColumnWithMapper = exports.Column = void 0;
-const sql_1 = require("./sql");
+exports.Column = void 0;
+// export type UpdateColumnConfig<
+// 	T extends ColumnBaseConfig,
+// 	TUpdate extends Partial<ColumnBaseConfig>,
+// > = Update<T, TUpdate, keyof ColumnBaseConfig>;
+/*
+    `Column` only accepts a full `ColumnConfig` as its generic.
+    To infer parts of the config, use `AnyColumn` that accepts a partial config.
+    See `GetColumnData` for example usage of inferring.
+*/
 class Column {
     constructor(table, builder) {
         this.table = table;
-        /*
-            mapFromDriverValue and mapToDriverValue are provided just as a runtime fallback - if you need to override them,
-            extend the ColumnWithMapper class instead for proper type-checking.
-        */
-        this.mapFromDriverValue = (value) => {
-            return value;
-        };
-        this.mapToDriverValue = (value) => {
-            return value;
-        };
-        this.name = builder.name;
-        this.notNull = builder._notNull;
-        this.default = builder._default;
-        this.primary = builder._primaryKey;
+        this.name = builder.config.name;
+        this.notNull = builder.config.notNull;
+        this.default = builder.config.default;
+        this.primary = builder.config.primaryKey;
     }
-}
-exports.Column = Column;
-class ColumnWithMapper extends Column {
-    constructor() {
-        super(...arguments);
-        this.mapFromDriverValue = (value) => {
-            return value;
-        };
-        this.mapToDriverValue = (value) => {
-            return value;
-        };
+    mapFromDriverValue(value) {
+        return value;
+    }
+    mapToDriverValue(value) {
+        return value;
     }
 }
-exports.ColumnWithMapper = ColumnWithMapper;
-function param(column, value) {
-    return new sql_1.BoundParamValue(value, column);
-}
-exports.param = param;
+exports.Column = Column;
 //# sourceMappingURL=column.js.map

package/column.js.map

@@ -1 +1 @@
-{"version":3,"file":"column.js","sourceRoot":"","sources":["../src/column.ts"],"names":[],"mappings":";;;AAEA,+BAA0D;AAG1D,MAAsB,MAAM;IAqB3B,YACU,KAA2B,EACpC,OAAkE;QADzD,UAAK,GAAL,KAAK,CAAsB;QASrC;;;UAGE;QACF,uBAAkB,GAAG,CAAC,KAAU,EAAO,EAAE;YACxC,OAAO,KAAK,CAAC;QACd,CAAC,CAAC;QAEF,qBAAgB,GAAG,CAAC,KAAU,EAAO,EAAE;YACtC,OAAO,KAAK,CAAC;QACd,CAAC,CAAC;QAhBD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IACpC,CAAC;CAeD;AA5CD,wBA4CC;AAED,MAAsB,gBAMpB,SAAQ,MAA8D;IANxE;;QASU,uBAAkB,GAAG,CAAC,KAA2B,EAAiB,EAAE;YAC5E,OAAO,KAAY,CAAC;QACrB,CAAC,CAAC;QAEO,qBAAgB,GAAG,CAAC,KAAoB,EAAwB,EAAE;YAC1E,OAAO,KAAY,CAAC;QACrB,CAAC,CAAC;IACH,CAAC;CAAA;AAhBD,4CAgBC;AAkBD,SAAgB,KAAK,CACpB,MAA8C,EAC9C,KAAwB;IAExB,OAAO,IAAI,qBAAe,CAAC,KAAkB,EAAE,MAAM,CAAC,CAAC;AACxD,CAAC;AALD,sBAKC"}
+{"version":3,"file":"column.js","sourceRoot":"","sources":["../src/column.ts"],"names":[],"mappings":";;;AAeA,kCAAkC;AAClC,+BAA+B;AAC/B,8CAA8C;AAC9C,kDAAkD;AAElD;;;;EAIE;AACF,MAAsB,MAAM;IAe3B,YAAqB,KAA4B,EAAE,OAA4C;QAA1E,UAAK,GAAL,KAAK,CAAuB;QAChD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;IAC1C,CAAC;IAID,kBAAkB,CAAC,KAAuB;QACzC,OAAO,KAAY,CAAC;IACrB,CAAC;IAED,gBAAgB,CAAC,KAAgB;QAChC,OAAO,KAAY,CAAC;IACrB,CAAC;CACD;AA/BD,wBA+BC"}

package/connection.d.ts

@@ -3,21 +3,15 @@ export declare type MigrationMeta = {
     folderMillis: number;
     hash: string;
 };
-export interface Session<TQueryParam, TQueryResponse> {
-    query(query: string, params: TQueryParam[]): TQueryResponse;
+export interface Logger {
+    logQuery(query: string, params: unknown[]): void;
 }
-export interface Driver<TSession> {
-    connect(): Promise<TSession>;
+export declare class DefaultLogger implements Logger {
+    logQuery(query: string, params: unknown[]): void;
 }
-export interface Dialect<TSession, TDatabase> {
-    createDB(session: TSession): TDatabase;
-    migrate(migrations: MigrationMeta[], session: TSession): Promise<void>;
+export declare class NoopLogger implements Logger {
+    logQuery(): void;
 }
-export interface Connector<TSession, TOperations> {
-    dialect: Dialect<TSession, TOperations>;
-    driver: Driver<TSession>;
-}
-export declare function connect<TSession, TDatabase>(connector: Connector<TSession, TDatabase>): Promise<TDatabase>;
 export interface KitConfig {
     out: string;
     schema: string;
@@ -25,5 +19,4 @@ export interface KitConfig {
 export interface MigrationConfig {
     migrationsFolder: string;
 }
-export declare function migrate<TSession, TDatabase>(connector: Connector<TSession, TDatabase>, config: string): Promise<void>;
-export declare function migrate<TSession, TDatabase>(connector: Connector<TSession, TDatabase>, config: MigrationConfig): Promise<void>;
+export declare function readMigrationFiles(config: string | MigrationConfig): MigrationMeta[];

package/connection.js

@@ -22,70 +22,61 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrate = exports.connect = void 0;
+exports.readMigrationFiles = exports.NoopLogger = exports.DefaultLogger = void 0;
 const crypto = __importStar(require("crypto"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-function connect(connector) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const session = yield connector.driver.connect();
-        return connector.dialect.createDB(session);
-    });
+class DefaultLogger {
+    logQuery(query, params) {
+        console.log(`Executing query:\n${query}\nParams:\n${JSON.stringify(params, null, 2)}\n`);
+    }
 }
-exports.connect = connect;
-function migrate(connector, config) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let migrationFolderTo;
-        if (typeof config === 'string') {
-            const configAsString = fs.readFileSync(path.resolve('.', config), 'utf8');
-            const jsonConfig = JSON.parse(configAsString);
-            migrationFolderTo = jsonConfig.out;
-        }
-        else {
-            migrationFolderTo = config.migrationsFolder;
-        }
-        if (!migrationFolderTo) {
-            throw Error('no migration folder defined');
-        }
-        const files1 = fs.readdirSync(migrationFolderTo);
-        const migrationQueries = [];
-        for (const migrationFolder of files1) {
-            if (migrationFolder === '.DS_Store') {
-                continue;
-            }
-            const migrationFiles = fs.readdirSync(`${migrationFolderTo}/${migrationFolder}`);
-            const migrationFile = migrationFiles.filter((file) => file === 'migration.sql')[0];
-            const query = fs
-                .readFileSync(`${migrationFolderTo}/${migrationFolder}/${migrationFile}`)
-                .toString();
-            const year = Number(migrationFolder.slice(0, 4));
-            // second param for Date() is month index, that started from 0, so we need
-            // to decrement a value for month
-            const month = Number(migrationFolder.slice(4, 6)) - 1;
-            const day = Number(migrationFolder.slice(6, 8));
-            const hour = Number(migrationFolder.slice(8, 10));
-            const min = Number(migrationFolder.slice(10, 12));
-            const sec = Number(migrationFolder.slice(12, 14));
-            const folderAsMillis = Date.UTC(year, month, day, hour, min, sec);
-            migrationQueries.push({
-                sql: query,
-                folderMillis: folderAsMillis,
-                hash: crypto.createHash('sha256').update(query).digest('hex'),
-            });
+exports.DefaultLogger = DefaultLogger;
+class NoopLogger {
+    logQuery() { }
+}
+exports.NoopLogger = NoopLogger;
+function readMigrationFiles(config) {
+    let migrationFolderTo;
+    if (typeof config === 'string') {
+        const configAsString = fs.readFileSync(path.resolve('.', config), 'utf8');
+        const jsonConfig = JSON.parse(configAsString);
+        migrationFolderTo = jsonConfig.out;
+    }
+    else {
+        migrationFolderTo = config.migrationsFolder;
+    }
+    if (!migrationFolderTo) {
+        throw Error('no migration folder defined');
+    }
+    const files1 = fs.readdirSync(migrationFolderTo);
+    const migrationQueries = [];
+    for (const migrationFolder of files1) {
+        if (migrationFolder === '.DS_Store') {
+            continue;
         }
-        const session = yield connector.driver.connect();
-        yield connector.dialect.migrate(migrationQueries, session);
-    });
+        const migrationFiles = fs.readdirSync(`${migrationFolderTo}/${migrationFolder}`);
+        const migrationFile = migrationFiles.filter((file) => file === 'migration.sql')[0];
+        const query = fs
+            .readFileSync(`${migrationFolderTo}/${migrationFolder}/${migrationFile}`)
+            .toString();
+        const year = Number(migrationFolder.slice(0, 4));
+        // second param for Date() is month index, that started from 0, so we need
+        // to decrement a value for month
+        const month = Number(migrationFolder.slice(4, 6)) - 1;
+        const day = Number(migrationFolder.slice(6, 8));
+        const hour = Number(migrationFolder.slice(8, 10));
+        const min = Number(migrationFolder.slice(10, 12));
+        const sec = Number(migrationFolder.slice(12, 14));
+        const folderAsMillis = Date.UTC(year, month, day, hour, min, sec);
+        migrationQueries.push({
+            sql: query,
+            folderMillis: folderAsMillis,
+            hash: crypto.createHash('sha256').update(query).digest('hex'),
+        });
+    }
+    return migrationQueries;
 }
-exports.migrate = migrate;
+exports.readMigrationFiles = readMigrationFiles;
 //# sourceMappingURL=connection.js.map

package/connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AACjC,uCAAyB;AACzB,2CAA6B;AAQ7B,MAAa,aAAa;IACzB,QAAQ,CAAC,KAAa,EAAE,MAAiB;QACxC,OAAO,CAAC,GAAG,CAAC,qBAAqB,KAAK,cAAc,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1F,CAAC;CACD;AAJD,sCAIC;AAED,MAAa,UAAU;IACtB,QAAQ,KAAU,CAAC;CACnB;AAFD,gCAEC;AAWD,SAAgB,kBAAkB,CAAC,MAAgC;IAClE,IAAI,iBAAqC,CAAC;IAC1C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC/B,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAc,CAAC;QAC3D,iBAAiB,GAAG,UAAU,CAAC,GAAG,CAAC;KACnC;SAAM;QACN,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,CAAC;KAC5C;IAED,IAAI,CAAC,iBAAiB,EAAE;QACvB,MAAM,KAAK,CAAC,6BAA6B,CAAC,CAAC;KAC3C;IAED,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IACjD,MAAM,gBAAgB,GAAoB,EAAE,CAAC;IAC7C,KAAK,MAAM,eAAe,IAAI,MAAM,EAAE;QACrC,IAAI,eAAe,KAAK,WAAW,EAAE;YACpC,SAAS;SACT;QACD,MAAM,cAAc,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,iBAAiB,IAAI,eAAe,EAAE,CAAC,CAAC;QACjF,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnF,MAAM,KAAK,GAAG,EAAE;aACd,YAAY,CAAC,GAAG,iBAAiB,IAAI,eAAe,IAAI,aAAa,EAAE,CAAC;aACxE,QAAQ,EAAE,CAAC;QAEb,MAAM,IAAI,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACjD,0EAA0E;QAC1E,iCAAiC;QACjC,MAAM,KAAK,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QAElD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAClE,gBAAgB,CAAC,IAAI,CAAC;YACrB,GAAG,EAAE,KAAK;YACV,YAAY,EAAE,cAAc;YAC5B,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC7D,CAAC,CAAC;KACH;IAED,OAAO,gBAAgB,CAAC;AACzB,CAAC;AA7CD,gDA6CC"}

package/index.d.ts

@@ -1,4 +1,4 @@
-export { sql } from './sql';
-export * from './table';
 export * from './column';
 export * from './connection';
+export { param, sql } from './sql';
+export { Table } from './table';

package/index.js

@@ -14,10 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sql = void 0;
-var sql_1 = require("./sql");
-Object.defineProperty(exports, "sql", { enumerable: true, get: function () { return sql_1.sql; } });
-__exportStar(require("./table"), exports);
+exports.Table = exports.sql = exports.param = void 0;
 __exportStar(require("./column"), exports);
 __exportStar(require("./connection"), exports);
+var sql_1 = require("./sql");
+Object.defineProperty(exports, "param", { enumerable: true, get: function () { return sql_1.param; } });
+Object.defineProperty(exports, "sql", { enumerable: true, get: function () { return sql_1.sql; } });
+var table_1 = require("./table");
+Object.defineProperty(exports, "Table", { enumerable: true, get: function () { return table_1.Table; } });
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAAnB,0FAAA,GAAG,OAAA;AACZ,0CAAwB;AACxB,2CAAyB;AACzB,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,+CAA6B;AAC7B,6BAAmC;AAA1B,4FAAA,KAAK,OAAA;AAAE,0FAAA,GAAG,OAAA;AACnB,iCAAgC;AAAvB,8FAAA,KAAK,OAAA"}

package/operations.d.ts

@@ -1,13 +1,18 @@
-import { ColumnData, ColumnDriverParam, TableName } from './branded-types';
-import { AnyColumn, Column } from './column';
-import { AnySQLResponse, SQLResponse } from './sql';
-export declare type RequiredKeyOnly<TKey extends string, T extends AnyColumn> = T extends Column<any, any, any, infer TNotNull, infer THasDefault> ? [TNotNull, THasDefault] extends [true, false] | [] ? TKey : never : never;
+import { AnyColumn } from './column';
+import { SQL, SQLResponse } from './sql';
+export declare type RequiredKeyOnly<TKey extends string, T extends AnyColumn> = T extends AnyColumn<{
+    notNull: true;
+    hasDefault: false;
+}> ? TKey : never;
 export declare type OptionalKeyOnly<TKey extends string, T extends AnyColumn> = TKey extends RequiredKeyOnly<TKey, T> ? never : TKey;
-export declare type SelectFields<TTableName extends TableName, TColumnDriverParam extends ColumnDriverParam = ColumnDriverParam> = {
-    [key: string]: SQLResponse<TTableName, ColumnData> | AnyColumn<TTableName, any, TColumnDriverParam>;
+export declare type SelectFields<TTableName extends string, TColumnDriverParam> = {
+    [key: string]: SQL | SQLResponse | AnyColumn<{
+        tableName: TTableName;
+        driverParam: TColumnDriverParam;
+    }>;
 };
 export declare type SelectFieldsOrdered = {
     name: string;
     resultTableName: string;
-    column: AnyColumn | AnySQLResponse;
+    field: AnyColumn | SQL | SQLResponse;
 }[];

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "drizzle-orm",
-  "version": "0.12.0-beta.0",
+  "version": "0.12.0-beta.10",
   "description": "Drizzle ORM package for SQL databases",
   "main": "index.js",
   "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/drizzle-team/drizzle-orm.git"
@@ -25,8 +28,8 @@
   },
   "homepage": "https://github.com/drizzle-team/drizzle-orm#readme",
   "peerDependencies": {
-    "drizzle-orm-mysql": ">=0.12.0-beta.0",
-    "drizzle-orm-pg": ">=0.12.0",
+    "drizzle-orm-mysql": ">=0.12.0 <0.13.0 || >=0.12.0-beta.0 <0.13.0-beta.0",
+    "drizzle-orm-pg": ">=0.12.0 <0.13.0 || >=0.12.0-beta.0 <0.13.0-beta.0",
     "mysql2": ">=2 <3",
     "pg": ">=8 <9",
     "sqlite3": ">=5 <6"
@@ -49,6 +52,7 @@
     }
   },
   "devDependencies": {
+    "@types/node": "*",
     "@types/pg": "^8.6.1",
     "@types/sqlite3": "^3.1.8",
     "mysql2": "^2.3.3",
@@ -56,7 +60,7 @@
     "resolve-tspaths": "^0.7.0",
     "sqlite3": "^5.0.8",
     "ts-node": "^10.8.2",
-    "typescript": "4.8.0-beta",
+    "typescript": "^4.8.4",
     "uvu": "^0.5.6"
   },
   "dependencies": {
@@ -64,8 +68,9 @@
   },
   "scripts": {
     "build": "tsc",
-    "pack": "cp package.json dist/ && (cd dist && pnpm pack --pack-destination ..) && rm -f package.tgz && mv *.tgz package.tgz",
-    "publish:beta": "pnpm publish package.tgz --tag beta --access public --git-checks false",
+    "pack": "cp ../readme.md dist/ && cp package.json dist/ && (cd dist && pnpm pack --pack-destination ..) && rm -f package.tgz && mv *.tgz package.tgz",
+    "publish:beta": "pnpm publish package.tgz --tag beta --git-checks false",
+    "release:beta": "pnpm build && pnpm version prerelease && pnpm run pack && pnpm publish:beta",
     "build:int": "pnpm build && pnpm run pack"
   }
 }

package/readme.md

@@ -0,0 +1,30 @@
+## DrizzleORM
+DrizzleORM is a TypeScript ORM library with a [drizzle-kit](#migrations) CLI companion for automatic SQL migrations generation. 
+It's meant to be a library, not a framework, stay as an opt-in solution all the time at any levels. 
+We try to follow SQL-like syntax whenever possible, be strongly typed ground top and fail in compile time, not in runtime. 
+We implemented best in class `joins` and second to none `migrations generation`. 
+Library has almost zero dependencies and being battle tested on production projects by multiple teams 🚀
+
+| database    | support |            |
+|:--          |  :---:  | :--        |
+| PostgreSQL  | ✅      |[Docs](https://github.com/drizzle-team/drizzle-orm/tree/main/drizzle-orm-pg)|
+| MySQL       | ✅      |[Docs](https://github.com/drizzle-team/drizzle-orm/tree/main/drizzle-orm-mysql)|            |
+| SQLite      | ⏳      |            |  
+| DynamoDB    | ⏳      |            |
+| MS SQL      | ⏳      |            |
+| CockroachDB | ⏳      |            |
+
+### Installation
+```bash
+// postgresql
+npm install drizzle-orm drizzle-orm-pg
+npm install -D drizzle-kit
+
+// mysql
+npm install drizzle-orm drizzle-orm-mysql
+npm install -D drizzle-kit
+
+// sqlite
+npm install drizzle-orm drizzle-orm-sqlite
+npm install -D drizzle-kit
+```