drizzle-orm 0.12.0-beta.5 → 0.12.0-beta.7

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,41 @@
+"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 proxiedColumns = {};
+            Object.keys(tableObj[table_1.Table.Symbol.Columns]).map((key) => {
+                proxiedColumns[key] = new Proxy(tableObj[table_1.Table.Symbol.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,cAAc,GAA2B,EAAE,CAAC;YAClD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACvD,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,CAC9B,QAAQ,CAAC,aAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAE,EACpC,IAAI,uBAAuB,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CACtD,CAAC;YACH,CAAC,CAAC,CAAC;YACH,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;AAzBD,wDAyBC"}

package/column-builder.d.ts

@@ -1,15 +1,31 @@
-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';
-        data: TData;
-        driverParam: TDriverParam;
-        notNull: TNotNull;
-        default: THasDefault;
+import { SQL } from './sql';
+import { RequiredKeys } from './utils';
+export interface ColumnBuilderBaseConfig {
+    data: unknown;
+    driverParam: unknown;
+    notNull: boolean;
+    hasDefault: boolean;
+}
+export declare type ColumnBuilderConfig<TPartial extends Partial<ColumnBuilderBaseConfig> = {}> = UpdateColumnBuilderConfig<ColumnBuilderBaseConfig & {
+    notNull: false;
+    hasDefault: false;
+}, TPartial>;
+export declare type UpdateColumnBuilderConfig<T extends ColumnBuilderBaseConfig, TUpdate extends Partial<ColumnBuilderBaseConfig>> = {} extends TUpdate ? T : RequiredKeys<Omit<T, keyof TUpdate> & Pick<TUpdate, keyof ColumnBuilderBaseConfig>>;
+export declare abstract class ColumnBuilder<T extends ColumnBuilderBaseConfig> {
+    protected $config: T;
+    protected $brand: {
+        type: 'ColumnBuilder';
+        subtype: string;
     };
     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<UpdateColumnBuilderConfig<T, {
+        notNull: true;
+    }>>;
+    default(value: T['data'] | SQL): ColumnBuilder<UpdateColumnBuilderConfig<T, {
+        hasDefault: true;
+    }>>;
+    primaryKey(): ColumnBuilder<UpdateColumnBuilderConfig<T, {
+        notNull: true;
+    }>>;
 }
+export declare type AnyColumnBuilder<TPartial extends Partial<ColumnBuilderBaseConfig> = {}> = ColumnBuilder<UpdateColumnBuilderConfig<ColumnBuilderBaseConfig, TPartial>>;

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;QALxB,gBAAgB,CAAC,aAAQ,GAAG,KAAiB,CAAC;QAE9C,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,IAAmC,CAAC;IAC5C,CAAC;IAED,OAAO,CACN,KAA6B;QAE7B,IAAI,CAAC,QAAQ,GAAG,KAAc,CAAC;QAC/B,OAAO,IAAmC,CAAC;IAC5C,CAAC;IAED,UAAU;QACT,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,OAAO,IAAsC,CAAC;IAC/C,CAAC;CAMD;AA5CD,sCA4CC"}
+{"version":3,"file":"column-builder.js","sourceRoot":"","sources":["../src/column-builder.ts"],"names":[],"mappings":";;;AAuBA,+GAA+G;AAC/G,MAAsB,aAAa;IAelC,YAAY,IAAY;QACvB,IAAI,CAAC,MAAM,GAAG;YACb,IAAI;YACJ,OAAO,EAAE,KAAqB;YAC9B,OAAO,EAAE,SAAS;YAClB,UAAU,EAAE,KAAK;SACjB,CAAC;IACH,CAAC;IAED,OAAO;QACN,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,IAAoB,CAAC;QAC3C,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;AAxCD,sCAwCC"}

package/column.d.ts

@@ -1,31 +1,43 @@
-import { ColumnData, ColumnDriverParam, ColumnHasDefault, ColumnNotNull, TableName, Unwrap } from './branded-types';
-import { ColumnBuilder } from './column-builder';
-import { BoundParamValue, DriverValueMapper } 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 DriverValueMapper<Unwrap<TData>, Unwrap<TDriverParam>> {
-    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 { RequiredKeys } from './utils';
+export interface ColumnBaseConfig extends ColumnBuilderBaseConfig {
+    tableName: string;
+}
+export declare type ColumnConfig<TPartial extends Partial<ColumnBaseConfig> = {}> = UpdateColumnConfig<ColumnBuilderConfig & {
+    tableName: string;
+}, TPartial>;
+export declare type UpdateColumnConfig<T extends ColumnBaseConfig, TUpdate extends Partial<ColumnBaseConfig>> = {} extends TUpdate ? T : RequiredKeys<Omit<T, keyof TUpdate> & Pick<TUpdate, keyof ColumnBaseConfig>>;
+export declare abstract class Column<T extends 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>);
+    readonly notNull: boolean;
+    readonly default: T['data'] | SQL | undefined;
+    constructor(table: Table<T['tableName']>, builder: ColumnBuilder<Omit<T, 'tableName'>>);
     abstract getSQLType(): string;
-    mapFromDriverValue(value: Unwrap<TDriverParam>): Unwrap<TData>;
-    mapToDriverValue(value: Unwrap<TData>): Unwrap<TDriverParam>;
+    mapFromDriverValue(value: T['driverParam']): T['data'];
+    mapToDriverValue(value: T['data']): T['driverParam'];
 }
-export declare type AnyColumn<TTableName extends TableName = TableName, TData extends ColumnData = ColumnData, TDriverParam extends ColumnDriverParam = ColumnDriverParam, TNotNull extends ColumnNotNull = ColumnNotNull, THasDefault extends ColumnHasDefault = ColumnHasDefault> = Column<TTableName, TData, TDriverParam, TNotNull, THasDefault>;
-export declare function param<TData extends ColumnData, TDriver extends ColumnDriverParam>(value: Unwrap<TData>, mapper: DriverValueMapper<Unwrap<TData>, Unwrap<TDriver>>): BoundParamValue<TData, TDriver>;
-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 AnyColumn<TPartial extends Partial<ColumnBaseConfig> = {}> = Column<UpdateColumnConfig<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;

package/column.js

@@ -1,14 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.param = exports.Column = void 0;
-const sql_1 = require("./sql");
+exports.Column = void 0;
+/*
+    `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;
-        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;
     }
     mapFromDriverValue(value) {
         return value;
@@ -18,8 +22,4 @@ class Column {
     }
 }
 exports.Column = Column;
-function param(value, mapper) {
-    return new sql_1.BoundParamValue(value, mapper);
-}
-exports.param = param;
 //# sourceMappingURL=column.js.map

package/column.js.map

@@ -1 +1 @@
-{"version":3,"file":"column.js","sourceRoot":"","sources":["../src/column.ts"],"names":[],"mappings":";;;AAEA,+BAA2D;AAG3D,MAAsB,MAAM;IAqB3B,YACU,KAA2B,EACpC,OAAkE;QADzD,UAAK,GAAL,KAAK,CAAsB;QAGpC,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;IAID,kBAAkB,CAAC,KAA2B;QAC7C,OAAO,KAAY,CAAC;IACrB,CAAC;IAED,gBAAgB,CAAC,KAAoB;QACpC,OAAO,KAAY,CAAC;IACrB,CAAC;CACD;AAxCD,wBAwCC;AAUD,SAAgB,KAAK,CACpB,KAAoB,EACpB,MAAyD;IAEzD,OAAO,IAAI,qBAAe,CAAC,KAAc,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC;AALD,sBAKC"}
+{"version":3,"file":"column.js","sourceRoot":"","sources":["../src/column.ts"],"names":[],"mappings":";;;AAqBA;;;;EAIE;AACF,MAAsB,MAAM;IAa3B,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;AA7BD,wBA6BC"}

package/connection.d.ts

@@ -3,9 +3,6 @@ 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;
 }
@@ -15,18 +12,6 @@ export declare class DefaultLogger implements Logger {
 export declare class NoopLogger implements Logger {
     logQuery(): void;
 }
-export interface Driver<TSession> {
-    connect(): Promise<TSession>;
-}
-export interface Dialect<TSession, TDatabase> {
-    createDB(session: TSession): TDatabase;
-    migrate(migrations: MigrationMeta[], session: TSession): Promise<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;
@@ -34,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,17 +22,8 @@ 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 = exports.NoopLogger = exports.DefaultLogger = 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"));
@@ -46,56 +37,46 @@ class NoopLogger {
     logQuery() { }
 }
 exports.NoopLogger = NoopLogger;
-function connect(connector) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const session = yield connector.driver.connect();
-        return connector.dialect.createDB(session);
-    });
-}
-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'),
-            });
+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":"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"}

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 { AnySQL, AnySQLResponse, SQL, 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]: SQL<TTableName> | 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 | AnySQL | AnySQLResponse;
+    field: AnyColumn | SQL | SQLResponse;
 }[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.12.0-beta.5",
+  "version": "0.12.0-beta.7",
   "description": "Drizzle ORM package for SQL databases",
   "main": "index.js",
   "types": "index.d.ts",
@@ -68,6 +68,7 @@
     "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 --git-checks false",
+    "release:beta": "pnpm build && pnpm version prerelease && pnpm run pack && pnpm publish:beta",
     "build:int": "pnpm build && pnpm run pack"
   }
 }

package/sql/expressions/conditions.d.ts

@@ -1,35 +1,33 @@
-import { ColumnNotNull, TableName } from '../../branded-types';
 import { AnyColumn, GetColumnData } from '../../column';
-import { GetTableName } from '../../utils';
-import { AnySQL, SQL, SQLWrapper } from '..';
-export declare function eq<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn, 'raw'>): SQL<GetTableName<TColumn>>;
-export declare function eq<TLeftTableName extends TableName, TRightTableName extends TableName>(left: AnyColumn<TLeftTableName>, right: AnyColumn<TRightTableName>): SQL<TLeftTableName | TRightTableName>;
-export declare function ne<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL<GetTableName<TColumn>>;
-export declare function ne<TLeftTableName extends TableName, TRightTableName extends TableName>(left: AnyColumn<TLeftTableName>, right: AnyColumn<TRightTableName>): SQL<TLeftTableName | TRightTableName>;
-declare type GetSQLListTableNames<T extends (AnySQL | undefined)[]> = T[number] extends SQL<infer TTableName> ? TTableName : never;
-export declare function and<TSQL extends (AnySQL | undefined)[]>(...conditions: TSQL): SQL<GetSQLListTableNames<TSQL>> | undefined;
-export declare function or<TTableName extends TableName>(...conditions: (SQL<TTableName> | undefined)[]): SQL<TTableName> | undefined;
-export declare function not<TTableName extends TableName>(condition: SQL<TTableName>): SQL<TTableName>;
-export declare function gt<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL<GetTableName<TColumn>>;
-export declare function gt<TLeftTableName extends TableName, TRightTableName extends TableName>(left: AnyColumn<TLeftTableName>, right: AnyColumn<TRightTableName>): SQL<TLeftTableName | TRightTableName>;
-export declare function gte<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn> extends AnyColumn ? never : GetColumnData<TColumn>): SQL<GetTableName<TColumn>>;
-export declare function gte<TLeftTableName extends TableName, TRightTableName extends TableName>(left: AnyColumn<TLeftTableName>, right: AnyColumn<TRightTableName>): SQL<TLeftTableName | TRightTableName>;
-export declare function lt<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn> extends AnyColumn ? never : GetColumnData<TColumn>): SQL<GetTableName<TColumn>>;
-export declare function lt<TLeftTableName extends TableName, TRightTableName extends TableName>(left: AnyColumn<TLeftTableName>, right: AnyColumn<TRightTableName>): SQL<TLeftTableName | TRightTableName>;
-export declare function lte<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn> extends AnyColumn ? never : GetColumnData<TColumn>): SQL<GetTableName<TColumn>>;
-export declare function lte<TLeftTableName extends TableName, TRightTableName extends TableName>(left: AnyColumn<TLeftTableName>, right: AnyColumn<TRightTableName>): SQL<TLeftTableName | TRightTableName>;
-export declare function inArray<TColumn extends AnyColumn>(column: TColumn, values: GetColumnData<TColumn>[]): SQL<GetTableName<TColumn>>;
-export declare function inArray<TColumn extends AnyColumn>(column: TColumn, subquery: SQLWrapper): SQL<GetTableName<TColumn>>;
-export declare function notInArray<TColumn extends AnyColumn>(column: TColumn, values: GetColumnData<TColumn>[]): SQL<GetTableName<TColumn>>;
-export declare function notInArray<TTableName extends TableName, TColumn extends AnyColumn<TTableName>>(column: TColumn, subquery: SQLWrapper): SQL<TTableName>;
-export declare function isNull<TColumn extends AnyColumn<any, any, any, ColumnNotNull<false>>>(column: TColumn): SQL<GetTableName<TColumn>>;
-export declare function isNotNull<TTableName extends TableName, TColumn extends AnyColumn<TTableName>>(column: TColumn): SQL<TTableName>;
-export declare function exists<TTableName extends TableName>(subquery: SQLWrapper): SQL<TTableName>;
-export declare function notExists<TTableName extends TableName>(subquery: SQLWrapper): SQL<TTableName>;
-export declare function between<TTableName extends TableName, TColumn extends AnyColumn<TTableName>>(column: TColumn, min: GetColumnData<TColumn, 'raw'>, max: GetColumnData<TColumn, 'raw'>): SQL<TTableName>;
-export declare function notBetween<TTableName extends TableName, TColumn extends AnyColumn<TTableName>>(column: TColumn, min: GetColumnData<TColumn, 'raw'>, max: GetColumnData<TColumn, 'raw'>): SQL<TTableName>;
-export declare function like<TTableName extends TableName, TColumn extends AnyColumn<TTableName>>(column: TColumn, value: string): SQL<TTableName>;
-export declare function notLike<TTableName extends TableName, TColumn extends AnyColumn<TTableName>>(column: TColumn, value: string): SQL<TTableName>;
-export declare function ilike<TTableName extends TableName, TColumn extends AnyColumn<TTableName>>(column: TColumn, value: string): SQL<TTableName>;
-export declare function notIlike<TTableName extends TableName, TColumn extends AnyColumn<TTableName>>(column: TColumn, value: string): SQL<TTableName>;
-export {};
+import { SQL, SQLWrapper } from '..';
+export declare function eq<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn, 'raw'>): SQL;
+export declare function eq(left: AnyColumn, right: AnyColumn): SQL;
+export declare function ne<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL;
+export declare function ne(left: AnyColumn, right: AnyColumn): SQL;
+export declare function and(...conditions: (SQL | undefined)[]): SQL | undefined;
+export declare function or(...conditions: (SQL | undefined)[]): SQL | undefined;
+export declare function not(condition: SQL): SQL;
+export declare function gt<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL;
+export declare function gt(left: AnyColumn, right: AnyColumn): SQL;
+export declare function gte<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL;
+export declare function gte(left: AnyColumn, right: AnyColumn): SQL;
+export declare function lt<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL;
+export declare function lt(left: AnyColumn, right: AnyColumn): SQL;
+export declare function lte<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL;
+export declare function lte(left: AnyColumn, right: AnyColumn): SQL;
+export declare function inArray<TColumn extends AnyColumn>(column: TColumn, values: GetColumnData<TColumn>[]): SQL;
+export declare function inArray(column: AnyColumn, subquery: SQLWrapper): SQL;
+export declare function notInArray<TColumn extends AnyColumn>(column: TColumn, values: GetColumnData<TColumn>[]): SQL;
+export declare function notInArray(column: AnyColumn, subquery: SQLWrapper): SQL;
+export declare function isNull(column: AnyColumn<{
+    notNull: false;
+}>): SQL;
+export declare function isNotNull(column: AnyColumn): SQL;
+export declare function exists(subquery: SQLWrapper): SQL;
+export declare function notExists(subquery: SQLWrapper): SQL;
+export declare function between<TColumn extends AnyColumn>(column: TColumn, min: GetColumnData<TColumn, 'raw'>, max: GetColumnData<TColumn, 'raw'>): SQL;
+export declare function notBetween<TColumn extends AnyColumn>(column: TColumn, min: GetColumnData<TColumn, 'raw'>, max: GetColumnData<TColumn, 'raw'>): SQL;
+export declare function like(column: AnyColumn, value: string): SQL;
+export declare function notLike(column: AnyColumn, value: string): SQL;
+export declare function ilike(column: AnyColumn, value: string): SQL;
+export declare function notIlike(column: AnyColumn, value: string): SQL;

package/sql/expressions/conditions.js

@@ -8,7 +8,7 @@ function bindIfParam(value, column) {
         return value;
     }
     else {
-        return new __1.BoundParamValue(value, column);
+        return new __1.Param(value, column);
     }
 }
 function eq(left, right) {
@@ -84,7 +84,7 @@ function inArray(column, values) {
     if (values.length === 0) {
         throw new Error('inArray requires at least one value');
     }
-    return (0, __1.sql) `${column} in ${values.map((v) => new __1.BoundParamValue(v, column))}`;
+    return (0, __1.sql) `${column} in ${values.map((v) => new __1.Param(v, column))}`;
 }
 exports.inArray = inArray;
 function notInArray(column, values) {
@@ -94,7 +94,7 @@ function notInArray(column, values) {
     if (values.length === 0) {
         throw new Error('notInArray requires at least one value');
     }
-    return (0, __1.sql) `${column} not in ${values.map((v) => new __1.BoundParamValue(v, column))}`;
+    return (0, __1.sql) `${column} not in ${values.map((v) => new __1.Param(v, column))}`;
 }
 exports.notInArray = notInArray;
 function isNull(column) {

package/sql/expressions/conditions.js.map

@@ -1 +1 @@
-{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../../../src/sql/expressions/conditions.ts"],"names":[],"mappings":";;;AACA,yCAAgE;AAEhE,0BAAiF;AAEjF,SAAS,WAAW,CAAC,KAA6B,EAAE,MAAiB;IACpE,IAAI,KAAK,YAAY,eAAM,EAAE;QAC5B,OAAO,KAAK,CAAC;KACb;SAAM;QACN,OAAO,IAAI,mBAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;AACF,CAAC;AAeD,SAAgB,EAAE,CAAC,IAAe,EAAE,KAAqC;IACxE,OAAO,IAAA,OAAG,EAAA,GAAG,IAAI,MAAM,WAAW,CAAC,KAA+B,EAAE,IAAI,CAAC,EAAE,CAAC;AAC7E,CAAC;AAFD,gBAEC;AAeD,SAAgB,EAAE,CAAC,IAAe,EAAE,KAAqC;IACxE,OAAO,IAAA,OAAG,EAAA,GAAG,IAAI,OAAO,WAAW,CAAC,KAA+B,EAAE,IAAI,CAAC,EAAE,CAAC;AAC9E,CAAC;AAFD,gBAEC;AAKD,SAAgB,GAAG,CAClB,GAAG,UAAgB;IAEnB,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,OAAO,SAAS,CAAC;KACjB;IAED,MAAM,MAAM,GAAa,CAAC,OAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACxC,UAAU;SACR,MAAM,CAAC,CAAC,CAAC,EAAqC,EAAE,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC;SAC1E,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;QAC7B,IAAI,KAAK,KAAK,CAAC,EAAE;YAChB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACvB;aAAM;YACN,MAAM,CAAC,IAAI,CAAC,IAAA,OAAG,EAAA,OAAO,EAAE,SAAS,CAAC,CAAC;SACnC;IACF,CAAC,CAAC,CAAC;IACJ,MAAM,CAAC,IAAI,CAAC,IAAA,OAAG,EAAA,GAAG,CAAC,CAAC;IAEpB,OAAO,OAAG,CAAC,QAAQ,CAAC,MAAM,CAAoC,CAAC;AAChE,CAAC;AApBD,kBAoBC;AAED,SAAgB,EAAE,CACjB,GAAG,UAA2C;IAE9C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,OAAO,SAAS,CAAC;KACjB;IAED,MAAM,MAAM,GAAsB,CAAC,OAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,UAAU;SACR,MAAM,CAAC,CAAC,CAAC,EAAqC,EAAE,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC;SAC1E,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;QAC7B,IAAI,KAAK,KAAK,CAAC,EAAE;YAChB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACvB;aAAM;YACN,MAAM,CAAC,IAAI,CAAC,IAAA,OAAG,EAAA,MAAM,EAAE,SAAS,CAAC,CAAC;SAClC;IACF,CAAC,CAAC,CAAC;IACJ,MAAM,CAAC,IAAI,CAAC,IAAA,OAAG,EAAA,GAAG,CAAC,CAAC;IAEpB,OAAO,OAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AApBD,gBAoBC;AAED,SAAgB,GAAG,CAClB,SAA0B;IAE1B,OAAO,IAAA,OAAG,EAAA,OAAO,SAAS,EAAE,CAAC;AAC9B,CAAC;AAJD,kBAIC;AAaD,SAAgB,EAAE,CAAC,IAAe,EAAE,KAAqC;IACxE,OAAO,IAAA,OAAG,EAAA,GAAG,IAAI,MAAM,WAAW,CAAC,KAA+B,EAAE,IAAI,CAAC,EAAE,CAAC;AAC7E,CAAC;AAFD,gBAEC;AAaD,SAAgB,GAAG,CAAC,IAAe,EAAE,KAAqC;IACzE,OAAO,IAAA,OAAG,EAAA,GAAG,IAAI,OAAO,WAAW,CAAC,KAA+B,EAAE,IAAI,CAAC,EAAE,CAAC;AAC9E,CAAC;AAFD,kBAEC;AAaD,SAAgB,EAAE,CAAC,IAAe,EAAE,KAAqC;IACxE,OAAO,IAAA,OAAG,EAAA,GAAG,IAAI,MAAM,WAAW,CAAC,KAA+B,EAAE,IAAI,CAAC,EAAE,CAAC;AAC7E,CAAC;AAFD,gBAEC;AAaD,SAAgB,GAAG,CAAC,IAAe,EAAE,KAAqC;IACzE,OAAO,IAAA,OAAG,EAAA,GAAG,IAAI,OAAO,WAAW,CAAC,KAA+B,EAAE,IAAI,CAAC,EAAE,CAAC;AAC9E,CAAC;AAFD,kBAEC;AAYD,SAAgB,OAAO,CAAC,MAAiB,EAAE,MAAyC;IACnF,IAAI,IAAA,gBAAY,EAAC,MAAM,CAAC,EAAE;QACzB,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,QAAQ,MAAM,GAAG,CAAC;KACrC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;KACvD;IACD,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAe,CAAC,CAAe,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;AAC7F,CAAC;AARD,0BAQC;AAaD,SAAgB,UAAU,CAAC,MAAiB,EAAE,MAAyC;IACtF,IAAI,IAAA,gBAAY,EAAC,MAAM,CAAC,EAAE;QACzB,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,YAAY,MAAM,GAAG,CAAC;KACzC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC1D;IACD,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,WAAW,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAe,CAAC,CAAe,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;AACjG,CAAC;AARD,gCAQC;AAED,SAAgB,MAAM,CACrB,MAAe;IAEf,OAAO,IAAA,OAAG,EAAuB,GAAG,MAAM,UAAU,CAAC;AACtD,CAAC;AAJD,wBAIC;AAED,SAAgB,SAAS,CACxB,MAAe;IAEf,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,cAAc,CAAC;AACnC,CAAC;AAJD,8BAIC;AAED,SAAgB,MAAM,CACrB,QAAoB;IAEpB,OAAO,IAAA,OAAG,EAAY,WAAW,QAAQ,GAAG,CAAC;AAC9C,CAAC;AAJD,wBAIC;AAED,SAAgB,SAAS,CACxB,QAAoB;IAEpB,OAAO,IAAA,OAAG,EAAY,WAAW,QAAQ,GAAG,CAAC;AAC9C,CAAC;AAJD,8BAIC;AAED,SAAgB,OAAO,CACtB,MAAe,EACf,GAAkC,EAClC,GAAkC;IAElC,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,YAAY,GAAiB,QAAQ,GAAiB,EAAE,CAAC;AAC7E,CAAC;AAND,0BAMC;AAED,SAAgB,UAAU,CACzB,MAAe,EACf,GAAkC,EAClC,GAAkC;IAElC,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,gBAAgB,GAAiB,QAAQ,GAAiB,EAAE,CAAC;AACjF,CAAC;AAND,gCAMC;AAED,SAAgB,IAAI,CACnB,MAAe,EACf,KAAa;IAEb,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,SAAS,KAA2B,EAAE,CAAC;AAC3D,CAAC;AALD,oBAKC;AAED,SAAgB,OAAO,CACtB,MAAe,EACf,KAAa;IAEb,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,aAAa,KAA2B,EAAE,CAAC;AAC/D,CAAC;AALD,0BAKC;AAED,SAAgB,KAAK,CACpB,MAAe,EACf,KAAa;IAEb,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,UAAU,KAA2B,EAAE,CAAC;AAC5D,CAAC;AALD,sBAKC;AAED,SAAgB,QAAQ,CACvB,MAAe,EACf,KAAa;IAEb,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,cAAc,KAA2B,EAAE,CAAC;AAChE,CAAC;AALD,4BAKC"}
+{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../../../src/sql/expressions/conditions.ts"],"names":[],"mappings":"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"}

package/sql/expressions/select.d.ts

@@ -1,5 +1,4 @@
-import { TableName } from '../../branded-types';
 import { AnyColumn } from '../../column';
 import { SQL } from '..';
-export declare function asc<TTableName extends TableName>(column: AnyColumn<TTableName>): SQL<TTableName>;
-export declare function desc<TTableName extends TableName>(column: AnyColumn<TTableName>): SQL<TTableName>;
+export declare function asc(column: AnyColumn): SQL;
+export declare function desc(column: AnyColumn): SQL;

package/sql/expressions/select.js.map

@@ -1 +1 @@
-{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/sql/expressions/select.ts"],"names":[],"mappings":";;;AAEA,0BAA8B;AAE9B,SAAgB,GAAG,CAClB,MAA6B;IAE7B,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,MAAM,CAAC;AAC3B,CAAC;AAJD,kBAIC;AAED,SAAgB,IAAI,CACnB,MAA6B;IAE7B,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,OAAO,CAAC;AAC5B,CAAC;AAJD,oBAIC"}
+{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/sql/expressions/select.ts"],"names":[],"mappings":";;;AACA,0BAA8B;AAE9B,SAAgB,GAAG,CAAC,MAAiB;IACpC,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,MAAM,CAAC;AAC3B,CAAC;AAFD,kBAEC;AAED,SAAgB,IAAI,CAAC,MAAiB;IACrC,OAAO,IAAA,OAAG,EAAA,GAAG,MAAM,OAAO,CAAC;AAC5B,CAAC;AAFD,oBAEC"}

package/sql/index.d.ts

@@ -1,37 +1,35 @@
-import { ColumnData, ColumnDriverParam, TableName, Unwrap } from '../branded-types';
 import { AnyColumn } from '../column';
-import { AnyTable } from '../table';
-export declare class Param<TData = ColumnData | PrimitiveDriverParam> {
-    readonly value: TData;
-    constructor(value: TData);
+import { Table } from '../table';
+/**
+ * This class is used to indicate a primitive param value that is used in `sql` tag.
+ * It is only used on type level and is never instantiated at runtime.
+ * If you see a value of this type in the code, its runtime value is actually the primitive param value.
+ */
+export declare class FakePrimitiveParam {
 }
-export declare type Chunk<TTableName extends TableName = TableName> = string | AnyTable<TTableName> | AnyColumn<TTableName> | Name | Param;
+export declare type Chunk = string | Table | AnyColumn | Name | Param;
 export interface BuildQueryConfig {
     escapeName(name: string): string;
     escapeParam(num: number, value: unknown): string;
 }
-export interface PreparedQuery<TDriverParam extends ColumnDriverParam = ColumnDriverParam> {
+export interface PreparedQuery {
     sql: string;
-    params: TDriverParam[];
+    params: unknown[];
 }
 export interface SQLWrapper {
-    getSQL(): AnySQL;
+    getSQL(): SQL;
 }
 export declare function isSQLWrapper(param: unknown): param is SQLWrapper;
-export declare class SQL<TTableName extends TableName> implements SQLWrapper {
-    readonly queryChunks: Chunk<TTableName>[];
-    protected typeKeeper: {
-        brand: 'SQL';
-        tableName: TTableName;
-    };
-    constructor(queryChunks: Chunk<TTableName>[]);
-    toQuery<TDriverParamType = unknown>({ escapeName, escapeParam }: BuildQueryConfig): PreparedQuery<ColumnDriverParam<TDriverParamType>>;
-    getSQL(): AnySQL<TTableName>;
-    as<TDecoder extends DriverValueDecoder<any, any> | DriverValueDecoder<any, any>['mapFromDriverValue']>(decoder: TDecoder): SQLResponse<TTableName, GetDecoderColumnData<TDecoder>>;
-    as<TData>(): SQLResponse<TTableName, ColumnData<TData>>;
+export declare class SQL implements SQLWrapper {
+    readonly queryChunks: Chunk[];
+    protected $brand: 'SQL';
+    constructor(queryChunks: Chunk[]);
+    toQuery({ escapeName, escapeParam }: BuildQueryConfig): PreparedQuery;
+    getSQL(): SQL;
+    as<TDecoder extends DriverValueDecoder<any, any> | DriverValueDecoder<any, any>['mapFromDriverValue']>(decoder: TDecoder): SQLResponse<GetDecoderColumnData<TDecoder>>;
+    as<TData>(): SQLResponse<TData>;
 }
-export declare type GetDecoderColumnData<T> = T extends DriverValueDecoder<infer TData, any> ? ColumnData<TData> : T extends DriverValueDecoder<infer TData, any>['mapFromDriverValue'] ? ColumnData<TData> : never;
-export declare type AnySQL<TTableName extends TableName = TableName> = SQL<TTableName>;
+export declare type GetDecoderColumnData<T> = T extends DriverValueDecoder<infer TData, any> | DriverValueDecoder<infer TData, any>['mapFromDriverValue'] ? TData : never;
 /**
  * Any DB name (table, column, index etc.)
  */
@@ -51,39 +49,32 @@ export declare const noopEncoder: DriverValueEncoder<any, any>;
 export interface DriverValueMapper<TData, TDriverParam> extends DriverValueDecoder<TData, TDriverParam>, DriverValueEncoder<TData, TDriverParam> {
 }
 export declare const noopMapper: DriverValueMapper<any, any>;
-/**
- * Parameter value that is bound to a specific mapper (usually, a column of a specific type)
- * @param value - Parameter value to bind
- * @param mapper - Mapper to use to convert the value to/from the driver parameter
- */
-export declare class BoundParamValue<TDataType extends ColumnData, TDriverParamType extends ColumnDriverParam> {
+/** Parameter value that is optionally bound to an encoder (for example, a column). */
+export declare class Param<TDataType = unknown, TDriverParamType = TDataType> {
     readonly value: TDataType;
-    readonly mapper: DriverValueMapper<Unwrap<TDataType>, Unwrap<TDriverParamType>>;
+    readonly encoder: DriverValueEncoder<TDataType, TDriverParamType>;
     protected brand: 'BoundParamValue';
-    constructor(value: TDataType, mapper: DriverValueMapper<Unwrap<TDataType>, Unwrap<TDriverParamType>>);
+    /**
+     * @param value - Parameter value
+     * @param encoder - Encoder to convert the value to a driver parameter
+     */
+    constructor(value: TDataType, encoder?: DriverValueEncoder<TDataType, TDriverParamType>);
 }
-export declare type AnyBoundParamValue = BoundParamValue<any, any>;
-export declare type SQLSourceParam<TTableName extends TableName> = SQLSourceParam<TTableName>[] | ColumnData | SQLWrapper | AnySQL<TTableName> | AnyTable<TTableName> | AnyColumn<TTableName> | AnyBoundParamValue | Name | PrimitiveDriverParam | undefined;
-export declare type PrimitiveDriverParam = string | number | boolean | null;
-export declare function sql<TTableName extends TableName>(strings: TemplateStringsArray, ...params: (SQLSourceParam<TTableName> | PrimitiveDriverParam)[]): SQL<TTableName>;
-export declare function sql<TTableName extends string>(strings: TemplateStringsArray, ...params: (SQLSourceParam<TableName<TTableName>> | PrimitiveDriverParam)[]): SQL<TableName<TTableName>>;
+export declare function param<TData, TDriver>(value: TData, encoder?: DriverValueEncoder<TData, TDriver>): Param<TData, TDriver>;
+export declare type SQLSourceParam = SQLSourceParam[] | SQLWrapper | SQL | Table | AnyColumn | Param | Name | undefined | FakePrimitiveParam;
+export declare function sql(strings: TemplateStringsArray, ...params: any[]): SQL;
 export declare namespace sql {
-    function empty(): AnySQL;
-    function fromList<TTableName extends TableName = TableName>(list: SQLSourceParam<TTableName>[]): SQL<TTableName>;
+    function empty(): SQL;
+    function fromList(list: SQLSourceParam[]): SQL;
     /**
      * Convenience function to create an SQL query from a raw string.
      * @param str The raw SQL query string.
      */
-    function raw<TTableName extends TableName = TableName>(str: string): SQL<TTableName>;
+    function raw(str: string): SQL;
 }
-export declare class SQLResponse<TTableName extends TableName, TValue extends ColumnData> {
-    readonly sql: SQL<TTableName>;
+export declare class SQLResponse<TValue = unknown> {
+    readonly sql: SQL;
     readonly decoder: DriverValueDecoder<TValue, any>;
-    protected typeKeeper: {
-        brand: 'SQLResponse';
-        tableName: TTableName;
-        value: TValue;
-    };
-    constructor(sql: SQL<TTableName>, decoder: DriverValueDecoder<TValue, any>);
+    protected $brand: 'SQLResponse';
+    constructor(sql: SQL, decoder: DriverValueDecoder<TValue, any>);
 }
-export declare type AnySQLResponse<TTableName extends TableName = TableName> = SQLResponse<TTableName, any>;

package/sql/index.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SQLResponse = exports.sql = exports.BoundParamValue = exports.noopMapper = exports.noopEncoder = exports.noopDecoder = exports.Name = exports.SQL = exports.isSQLWrapper = exports.Param = void 0;
+exports.SQLResponse = exports.sql = exports.param = exports.Param = exports.noopMapper = exports.noopEncoder = exports.noopDecoder = exports.Name = exports.SQL = exports.isSQLWrapper = exports.FakePrimitiveParam = void 0;
 const column_1 = require("../column");
 const table_1 = require("../table");
-const utils_1 = require("../utils");
-class Param {
-    constructor(value) {
-        this.value = value;
-    }
+/**
+ * This class is used to indicate a primitive param value that is used in `sql` tag.
+ * It is only used on type level and is never instantiated at runtime.
+ * If you see a value of this type in the code, its runtime value is actually the primitive param value.
+ */
+class FakePrimitiveParam {
 }
-exports.Param = Param;
+exports.FakePrimitiveParam = FakePrimitiveParam;
 function isSQLWrapper(param) {
     return !!param && typeof param === 'object' && 'getSQL' in param;
 }
@@ -28,14 +29,14 @@ class SQL {
                 return escapeName(chunk.value);
             }
             else if (chunk instanceof table_1.Table) {
-                return escapeName(chunk[utils_1.tableName]);
+                return escapeName(chunk[table_1.Table.Symbol.Name]);
             }
             else if (chunk instanceof column_1.Column) {
-                return escapeName(chunk.table[utils_1.tableName]) + '.' + escapeName(chunk.name);
+                return escapeName(chunk.table[table_1.Table.Symbol.Name]) + '.' + escapeName(chunk.name);
             }
             else if (chunk instanceof Param) {
-                params.push(chunk.value);
-                return escapeParam(params.length, chunk.value);
+                params.push(chunk.encoder.mapToDriverValue(chunk.value));
+                return escapeParam(params.length - 1, chunk.value);
             }
             else {
                 const err = new Error('Unexpected chunk type!');
@@ -48,7 +49,7 @@ class SQL {
             .trim()
             .replace(/\s{2,}/g, ' ')
             .replace(/\n+/g, '');
-        return { sql: sqlString, params: params };
+        return { sql: sqlString, params };
     }
     getSQL() {
         return this;
@@ -74,18 +75,22 @@ exports.noopEncoder = {
     mapToDriverValue: (value) => value,
 };
 exports.noopMapper = Object.assign(Object.assign({}, exports.noopDecoder), exports.noopEncoder);
-/**
- * Parameter value that is bound to a specific mapper (usually, a column of a specific type)
- * @param value - Parameter value to bind
- * @param mapper - Mapper to use to convert the value to/from the driver parameter
- */
-class BoundParamValue {
-    constructor(value, mapper) {
+/** Parameter value that is optionally bound to an encoder (for example, a column). */
+class Param {
+    /**
+     * @param value - Parameter value
+     * @param encoder - Encoder to convert the value to a driver parameter
+     */
+    constructor(value, encoder = exports.noopEncoder) {
         this.value = value;
-        this.mapper = mapper;
+        this.encoder = encoder;
     }
 }
-exports.BoundParamValue = BoundParamValue;
+exports.Param = Param;
+function param(value, encoder) {
+    return new Param(value, encoder);
+}
+exports.param = param;
 function buildChunksFromParam(param) {
     if (Array.isArray(param)) {
         const result = ['('];
@@ -104,21 +109,23 @@ function buildChunksFromParam(param) {
     else if (isSQLWrapper(param)) {
         return buildChunksFromParam(param.getSQL());
     }
-    else if (param instanceof table_1.Table
-        || param instanceof column_1.Column
-        || param instanceof Name) {
+    else if (param instanceof table_1.Table || param instanceof column_1.Column || param instanceof Name || param instanceof Param) {
         return [param];
     }
-    else if (param instanceof BoundParamValue) {
-        return [new Param(param.mapper.mapToDriverValue(param.value))];
-    }
-    else if (typeof param !== 'undefined') {
+    else if (param !== undefined) {
         return [new Param(param)];
     }
     else {
         return [];
     }
 }
+/*
+    The type of `params` is specified as `SQLSourceParam[]`, but that's slightly incorrect -
+    in runtime, users won't pass `FakePrimitiveParam` instances as `params` - they will pass primitive values
+    which will be wrapped in `Param` using `buildChunksFromParam(...)`. That's why the overload
+    specify `params` as `any[]` and not as `SQLSourceParam[]`. This type is used to make our lives easier and
+    the type checker happy.
+*/
 function sql(strings, ...params) {
     const queryChunks = [];
     if (params.length > 0 || (strings.length > 0 && strings[0] !== '')) {

package/sql/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"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"}

package/table.d.ts

@@ -1,10 +1,6 @@
-import { TableName } from './branded-types';
-export declare type TableExtraConfig = Record<string, unknown>;
-export declare class Table<TName extends TableName> {
-    protected typeKeeper: {
-        brand: 'Table';
-        name: TName;
-    };
+export declare class Table<TName extends string = string> {
+    protected $brand: 'Table';
+    protected $name: TName;
     constructor(name: TName);
 }
-export declare type AnyTable<TName extends TableName = TableName> = Table<TName>;
+export declare function getTableName<TTableName extends string>(table: Table<TTableName>): TTableName;

package/table.js

@@ -1,11 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Table = void 0;
-const utils_1 = require("./utils");
+exports.getTableName = exports.Table = exports.OriginalName = exports.Columns = exports.Name = void 0;
+/** @internal */
+exports.Name = Symbol('Name');
+/** @internal */
+exports.Columns = Symbol('Columns');
+/** @internal */
+exports.OriginalName = Symbol('OriginalName');
 class Table {
     constructor(name) {
-        this[utils_1.tableName] = name;
+        this[exports.Name] = this[exports.OriginalName] = name;
     }
 }
 exports.Table = Table;
+/** @internal */
+Table.Symbol = {
+    Name: exports.Name,
+    OriginalName: exports.OriginalName,
+    Columns: exports.Columns,
+};
+function getTableName(table) {
+    return table[Table.Symbol.Name];
+}
+exports.getTableName = getTableName;
 //# sourceMappingURL=table.js.map

package/table.js.map

@@ -1 +1 @@
-{"version":3,"file":"table.js","sourceRoot":"","sources":["../src/table.ts"],"names":[],"mappings":";;;AAEA,mCAAkD;AAIlD,MAAa,KAAK;IAYjB,YAAY,IAAW;QACtB,IAAI,CAAC,iBAAS,CAAC,GAAG,IAAI,CAAC;IACxB,CAAC;CACD;AAfD,sBAeC"}
+{"version":3,"file":"table.js","sourceRoot":"","sources":["../src/table.ts"],"names":[],"mappings":";;;AAEA,gBAAgB;AACH,QAAA,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AAEnC,gBAAgB;AACH,QAAA,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAEzC,gBAAgB;AACH,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAEnD,MAAa,KAAK;IA0BjB,YAAY,IAAW;QACtB,IAAI,CAAC,YAAI,CAAC,GAAG,IAAI,CAAC,oBAAY,CAAC,GAAG,IAAI,CAAC;IACxC,CAAC;;AA5BF,sBA6BC;AAzBA,gBAAgB;AACA,YAAM,GAAG;IACxB,IAAI,EAAE,YAAmB;IACzB,YAAY,EAAE,oBAAmC;IACjD,OAAO,EAAE,eAAyB;CAClC,CAAC;AAsBH,SAAgB,YAAY,CAA4B,KAAwB;IAC/E,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC;AAFD,oCAEC"}

package/utils.d.ts

@@ -1,7 +1,6 @@
-import { ColumnData, ColumnDriverParam, TableName } from './branded-types';
-import { AnyColumn } from './column';
 import { SelectFieldsOrdered } from './operations';
-import { AnyTable } from './table';
-export declare function getTableName<TTableName extends TableName>(table: AnyTable<TTableName>): TTableName;
-export declare function mapResultRow<TResult extends Record<string, ColumnData | null>>(columns: SelectFieldsOrdered, row: ColumnDriverParam[], joinsNotNullable?: Record<string, boolean>): TResult;
-export declare type GetTableName<T extends AnyTable | AnyColumn> = T extends AnyTable<infer TName> ? TName : T extends AnyColumn<infer TName> ? TName : never;
+export declare function mapResultRow<TResult extends Record<string, unknown>>(columns: SelectFieldsOrdered, row: unknown[], joinsNotNullable?: Record<string, boolean>): TResult;
+export declare type RequiredKeys<T> = {
+    [K in keyof T]-?: T[K];
+};
+export declare type OneOrMany<T> = T | T[];

package/utils.js

@@ -1,18 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapResultRow = exports.getTableName = exports.tableColumns = exports.tableName = void 0;
+exports.mapResultRow = void 0;
 const column_1 = require("./column");
 const sql_1 = require("./sql");
-/** @internal */
-exports.tableName = Symbol('tableName');
-/** @internal */
-exports.tableColumns = Symbol('tableColumns');
-function getTableName(table) {
-    return table[exports.tableName];
-}
-exports.getTableName = getTableName;
 function mapResultRow(columns, row, joinsNotNullable) {
-    const result = columns.reduce((res, { name, resultTableName, column: columnOrResponse }, index) => {
+    const result = columns.reduce((res, { name, resultTableName, field: columnOrResponse }, index) => {
         let decoder;
         if (columnOrResponse instanceof column_1.Column) {
             decoder = columnOrResponse;

package/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AACA,qCAA6C;AAE7C,+BAAyC;AAGzC,gBAAgB;AACH,QAAA,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAE7C,gBAAgB;AACH,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAEnD,SAAgB,YAAY,CAA+B,KAA2B;IACrF,OAAO,KAAK,CAAC,iBAAS,CAAC,CAAC;AACzB,CAAC;AAFD,oCAEC;AAED,SAAgB,YAAY,CAC3B,OAA4B,EAC5B,GAAwB,EACxB,gBAA0C;IAE1C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAC5B,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,EAAE;QACnE,IAAI,OAAO,CAAC;QACZ,IAAI,gBAAgB,YAAY,eAAM,EAAE;YACvC,OAAO,GAAG,gBAAgB,CAAC;SAC3B;aAAM,IAAI,gBAAgB,YAAY,SAAG,EAAE;YAC3C,OAAO,GAAG,iBAAW,CAAC;SACtB;aAAM;YACN,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC;SACnC;QACD,IAAI,CAAC,CAAC,eAAe,IAAI,GAAG,CAAC,EAAE;YAC9B,GAAG,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC;SAC1B;QACD,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAE,CAAC;QAC7B,GAAG,CAAC,eAAe,CAAE,CAAC,IAAI,CAAC,GAAG,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC9F,OAAO,GAAG,CAAC;IACZ,CAAC,EACD,EAAE,CACF,CAAC;IAEF,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACrC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAY,CAAC;KAC3C;IAED,IAAI,CAAC,gBAAgB,EAAE;QACtB,OAAO,MAAiB,CAAC;KACzB;IAED,OAAO,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,EAAE;QACvD,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;YACjC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;YAC9E,IAAI,CAAC,UAAU,EAAE;gBAChB,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;aACzB;SACD;QACD,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACjC,CAAC,CAAC,CACS,CAAC;AACd,CAAC;AA5CD,oCA4CC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAElC,+BAAyC;AAGzC,SAAgB,YAAY,CAC3B,OAA4B,EAC5B,GAAc,EACd,gBAA0C;IAE1C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAC5B,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,EAAE;QAClE,IAAI,OAAO,CAAC;QACZ,IAAI,gBAAgB,YAAY,eAAM,EAAE;YACvC,OAAO,GAAG,gBAAgB,CAAC;SAC3B;aAAM,IAAI,gBAAgB,YAAY,SAAG,EAAE;YAC3C,OAAO,GAAG,iBAAW,CAAC;SACtB;aAAM;YACN,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC;SACnC;QACD,IAAI,CAAC,CAAC,eAAe,IAAI,GAAG,CAAC,EAAE;YAC9B,GAAG,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC;SAC1B;QACD,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAE,CAAC;QAC7B,GAAG,CAAC,eAAe,CAAE,CAAC,IAAI,CAAC,GAAG,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC9F,OAAO,GAAG,CAAC;IACZ,CAAC,EACD,EAAE,CACF,CAAC;IAEF,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACrC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAY,CAAC;KAC3C;IAED,IAAI,CAAC,gBAAgB,EAAE;QACtB,OAAO,MAAiB,CAAC;KACzB;IAED,OAAO,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,EAAE;QACvD,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;YACjC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;YAC9E,IAAI,CAAC,UAAU,EAAE;gBAChB,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;aACzB;SACD;QACD,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACjC,CAAC,CAAC,CACS,CAAC;AACd,CAAC;AA5CD,oCA4CC"}