kysely 0.16.11 → 0.17.2

package/README.md

@@ -20,8 +20,8 @@ much anything you can think of. Typescript is always there for you offering comp
 you build a valid query.
 
 Of course there are cases where things cannot be typed at compile time, and Kysely offers escape
-hatches for these situations. See the [DynamicModule](https://koskimas.github.io/kysely/classes/DynamicModule.html#ref)
-for more info.
+hatches for these situations. See the [sql template tag](https://koskimas.github.io/kysely/modules.html#sql) 
+and the [DynamicModule](https://koskimas.github.io/kysely/classes/DynamicModule.html#ref) for more info.
 
 If you start using Kysely and can't find something you'd want to use, please open an issue or join our
 [discord server](https://discord.gg/C9aJ49mCra).

package/dist/cjs/dialect/mysql/mysql-adapter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlAdapter = void 0;
+const sql_js_1 = require("../../raw-builder/sql.js");
 const dialect_adapter_base_js_1 = require("../dialect-adapter-base.js");
 const LOCK_ID = 'ea586330-2c93-47c8-908d-981d9d270f9d';
 const LOCK_TIMEOUT_SECONDS = 60 * 60;
@@ -18,12 +19,10 @@ class MysqlAdapter extends dialect_adapter_base_js_1.DialectAdapterBase {
         // is released using `release_lock`. This way we know that the lock is either
         // released by us after successfull or failed migrations OR it's released by
         // MySQL if the process gets killed for some reason.
-        await db
-            .raw(`select get_lock('${LOCK_ID}', ${LOCK_TIMEOUT_SECONDS})`)
-            .execute();
+        await (0, sql_js_1.sql) `select get_lock(${sql_js_1.sql.literal(LOCK_ID)}, ${sql_js_1.sql.literal(LOCK_TIMEOUT_SECONDS)})`.execute(db);
     }
     async releaseMigrationLock(db) {
-        await db.raw(`select release_lock('${LOCK_ID}')`).execute();
+        await (0, sql_js_1.sql) `select release_lock(${sql_js_1.sql.literal(LOCK_ID)})`.execute(db);
     }
 }
 exports.MysqlAdapter = MysqlAdapter;

package/dist/cjs/dialect/mysql/mysql-dialect-config.d.ts

@@ -202,4 +202,23 @@ export interface MysqlSslOptions {
      * You can also connect to a MySQL server without properly providing the appropriate CA to trust. You should not do this.
      */
     rejectUnauthorized?: boolean;
+    charsetNumber?: number;
+    compress?: boolean;
+    authSwitchHandler?: (data: any, callback: () => void) => any;
+    connectAttributes?: {
+        [param: string]: any;
+    };
+    decimalNumbers?: boolean;
+    isServer?: boolean;
+    maxPreparedStatements?: number;
+    namedPlaceholders?: boolean;
+    nestTables?: boolean | string;
+    passwordSha1?: string;
+    pool?: any;
+    stream?: any;
+    uri?: string;
+    Promise?: any;
+    authPlugins?: {
+        [key: string]: any;
+    };
 }

package/dist/cjs/dialect/mysql/mysql-introspector.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlIntrospector = void 0;
 const migrator_js_1 = require("../../migration/migrator.js");
 const object_utils_js_1 = require("../../util/object-utils.js");
+const sql_js_1 = require("../../raw-builder/sql.js");
 class MysqlIntrospector {
     #db;
     constructor(db) {
@@ -12,7 +13,7 @@ class MysqlIntrospector {
         let query = this.#db
             .selectFrom('information_schema.columns')
             .selectAll()
-            .where('table_schema', '=', this.#db.raw('database()'))
+            .where('table_schema', '=', (0, sql_js_1.sql) `database()`)
             .castTo();
         if (!options.withInternalKyselyTables) {
             query = query

package/dist/cjs/dialect/postgres/postgres-adapter.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgresAdapter = void 0;
+const sql_js_1 = require("../../raw-builder/sql.js");
 const dialect_adapter_base_js_1 = require("../dialect-adapter-base.js");
 // Random id for our transaction lock.
-const LOCK_ID = '3853314791062309107';
+const LOCK_ID = 3853314791062309107n;
 class PostgresAdapter extends dialect_adapter_base_js_1.DialectAdapterBase {
     get supportsTransactionalDdl() {
         return true;
@@ -13,7 +14,7 @@ class PostgresAdapter extends dialect_adapter_base_js_1.DialectAdapterBase {
     }
     async acquireMigrationLock(db) {
         // Acquire a transaction level advisory lock.
-        await db.raw(`select pg_advisory_xact_lock(${LOCK_ID})`).execute();
+        await (0, sql_js_1.sql) `select pg_advisory_xact_lock(${sql_js_1.sql.literal(LOCK_ID)})`.execute(db);
     }
     async releaseMigrationLock() {
         // Nothing to do here. `pg_advisory_xact_lock` is automatically released at the

package/dist/cjs/dialect/sqlite/sqlite-introspector.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqliteIntrospector = void 0;
 const migrator_js_1 = require("../../migration/migrator.js");
+const sql_js_1 = require("../../raw-builder/sql.js");
 class SqliteIntrospector {
     #db;
     constructor(db) {
@@ -27,7 +28,7 @@ class SqliteIntrospector {
     async #getTableMetadata(table) {
         const db = this.#db;
         const columns = await db
-            .selectFrom(db.raw(`PRAGMA_TABLE_INFO(?)`, [table]).as('table_info'))
+            .selectFrom((0, sql_js_1.sql) `PRAGMA_TABLE_INFO(${table})`.as('table_info'))
             .select(['name', 'type', 'notnull'])
             .castTo()
             .execute();

package/dist/cjs/driver/connection-provider.d.ts

@@ -4,5 +4,5 @@ export interface ConnectionProvider {
      * Provides a connection for the callback and takes care of disposing
      * the connection after the callback has been run.
      */
-    withConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
+    provideConnection<T>(consumer: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
 }

package/dist/cjs/driver/default-connection-provider.d.ts

@@ -8,5 +8,5 @@ export declare class DefaultConnectionProvider implements ConnectionProvider {
      * Provides a connection for the callback and takes care of disposing
      * the connection after the callback has been run.
      */
-    withConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
+    provideConnection<T>(consumer: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
 }

package/dist/cjs/driver/default-connection-provider.js

@@ -6,10 +6,10 @@ class DefaultConnectionProvider {
     constructor(driver) {
         this.#driver = driver;
     }
-    async withConnection(runner) {
+    async provideConnection(consumer) {
         const connection = await this.#driver.acquireConnection();
         try {
-            return await runner(connection);
+            return await consumer(connection);
         }
         finally {
             await this.#driver.releaseConnection(connection);

package/dist/cjs/driver/dummy-driver.d.ts

@@ -27,6 +27,14 @@ import { Driver } from './driver.js';
  *   },
  * })
  * ```
+ *
+ * You can use it to build a query and compile it to SQL but trying to
+ * execute the query will throw an error.
+ *
+ * ```ts
+ * const { sql } = db.selectFrom('person').selectAll().compile()
+ * console.log(sql) // select * from "person"
+ * ```
  */
 export declare class DummyDriver implements Driver {
     /**

package/dist/cjs/driver/dummy-driver.js

@@ -28,6 +28,14 @@ exports.DummyDriver = void 0;
  *   },
  * })
  * ```
+ *
+ * You can use it to build a query and compile it to SQL but trying to
+ * execute the query will throw an error.
+ *
+ * ```ts
+ * const { sql } = db.selectFrom('person').selectAll().compile()
+ * console.log(sql) // select * from "person"
+ * ```
  */
 class DummyDriver {
     async init() {

package/dist/cjs/driver/single-connection-provider.d.ts

@@ -7,5 +7,5 @@ export declare class SingleConnectionProvider implements ConnectionProvider {
      * Provides a connection for the callback and takes care of disposing
      * the connection after the callback has been run.
      */
-    withConnection<T>(runner: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
+    provideConnection<T>(consumer: (connection: DatabaseConnection) => Promise<T>): Promise<T>;
 }

package/dist/cjs/driver/single-connection-provider.js

@@ -7,11 +7,11 @@ class SingleConnectionProvider {
     constructor(connection) {
         this.#connection = connection;
     }
-    async withConnection(runner) {
+    async provideConnection(consumer) {
         while (this.#runningPromise) {
             await this.#runningPromise;
         }
-        const promise = this.#run(runner);
+        const promise = this.#run(consumer);
         this.#runningPromise = promise
             .then(() => {
             this.#runningPromise = undefined;

package/dist/cjs/index-nodeless.d.ts

@@ -17,9 +17,11 @@ export * from './query-builder/delete-result.js';
 export * from './query-builder/update-result.js';
 export * from './query-builder/on-conflict-builder.js';
 export * from './raw-builder/raw-builder.js';
+export * from './raw-builder/sql.js';
 export * from './query-executor/query-executor.js';
 export * from './query-executor/default-query-executor.js';
 export * from './query-executor/noop-query-executor.js';
+export * from './query-executor/query-executor-provider.js';
 export * from './query-compiler/default-query-compiler.js';
 export * from './query-compiler/compiled-query.js';
 export * from './schema/schema.js';

package/dist/cjs/index-nodeless.js

@@ -29,9 +29,11 @@ __exportStar(require("./query-builder/delete-result.js"), exports);
 __exportStar(require("./query-builder/update-result.js"), exports);
 __exportStar(require("./query-builder/on-conflict-builder.js"), exports);
 __exportStar(require("./raw-builder/raw-builder.js"), exports);
+__exportStar(require("./raw-builder/sql.js"), exports);
 __exportStar(require("./query-executor/query-executor.js"), exports);
 __exportStar(require("./query-executor/default-query-executor.js"), exports);
 __exportStar(require("./query-executor/noop-query-executor.js"), exports);
+__exportStar(require("./query-executor/query-executor-provider.js"), exports);
 __exportStar(require("./query-compiler/default-query-compiler.js"), exports);
 __exportStar(require("./query-compiler/compiled-query.js"), exports);
 __exportStar(require("./schema/schema.js"), exports);

package/dist/cjs/kysely.d.ts

@@ -6,11 +6,9 @@ import { QueryCreator } from './query-creator.js';
 import { KyselyPlugin } from './plugin/kysely-plugin.js';
 import { DatabaseIntrospector } from './dialect/database-introspector.js';
 import { Driver, IsolationLevel } from './driver/driver.js';
-import { ParseContext } from './parser/parse-context.js';
 import { FunctionBuilder } from './query-builder/function-builder.js';
 import { LogConfig } from './util/log.js';
-import { PRIVATE_ADAPTER } from './util/private-symbols.js';
-import { DialectAdapter } from './dialect/dialect-adapter.js';
+import { QueryExecutorProvider } from './query-executor/query-executor-provider.js';
 /**
  * The main Kysely class.
  *
@@ -54,7 +52,7 @@ import { DialectAdapter } from './dialect/dialect-adapter.js';
  *    in the database and values must be interfaces that describe the rows in those
  *    tables. See the examples above.
  */
-export declare class Kysely<DB> extends QueryCreator<DB> {
+export declare class Kysely<DB> extends QueryCreator<DB> implements QueryExecutorProvider {
     #private;
     constructor(args: KyselyConfig);
     constructor(args: KyselyProps);
@@ -226,7 +224,7 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
      * @internal
      * @private
      */
-    get [PRIVATE_ADAPTER](): DialectAdapter;
+    getExecutor(): QueryExecutor;
 }
 export declare class Transaction<DB> extends Kysely<DB> {
     #private;
@@ -357,7 +355,6 @@ export interface KyselyProps {
     readonly driver: Driver;
     readonly executor: QueryExecutor;
     readonly dialect: Dialect;
-    readonly parseContext: ParseContext;
 }
 export declare function isKyselyProps(obj: unknown): obj is KyselyProps;
 export interface KyselyConfig {

package/dist/cjs/kysely.js

@@ -11,10 +11,8 @@ const runtime_driver_js_1 = require("./driver/runtime-driver.js");
 const single_connection_provider_js_1 = require("./driver/single-connection-provider.js");
 const driver_js_1 = require("./driver/driver.js");
 const prevent_await_js_1 = require("./util/prevent-await.js");
-const parse_context_js_1 = require("./parser/parse-context.js");
 const function_builder_js_1 = require("./query-builder/function-builder.js");
 const log_js_1 = require("./util/log.js");
-const private_symbols_js_1 = require("./util/private-symbols.js");
 /**
  * The main Kysely class.
  *
@@ -64,7 +62,7 @@ class Kysely extends query_creator_js_1.QueryCreator {
         let superProps;
         let props;
         if (isKyselyProps(args)) {
-            superProps = { executor: args.executor, parseContext: args.parseContext };
+            superProps = { executor: args.executor };
             props = { ...args };
         }
         else {
@@ -73,17 +71,15 @@ class Kysely extends query_creator_js_1.QueryCreator {
             const compiler = dialect.createQueryCompiler();
             const adapter = dialect.createAdapter();
             const log = new log_js_1.Log(args.log ?? []);
-            const parseContext = new parse_context_js_1.DefaultParseContext(adapter);
             const runtimeDriver = new runtime_driver_js_1.RuntimeDriver(driver, log);
             const connectionProvider = new default_connection_provider_js_1.DefaultConnectionProvider(runtimeDriver);
-            const executor = new default_query_executor_js_1.DefaultQueryExecutor(compiler, connectionProvider, args.plugins ?? []);
-            superProps = { executor, parseContext };
+            const executor = new default_query_executor_js_1.DefaultQueryExecutor(compiler, adapter, connectionProvider, args.plugins ?? []);
+            superProps = { executor };
             props = {
                 config: args,
                 executor,
                 dialect,
                 driver: runtimeDriver,
-                parseContext,
             };
         }
         super(superProps);
@@ -139,7 +135,7 @@ class Kysely extends query_creator_js_1.QueryCreator {
      * ```
      */
     get fn() {
-        return new function_builder_js_1.FunctionBuilder({ executor: this.#props.executor });
+        return new function_builder_js_1.FunctionBuilder();
     }
     /**
      * Creates a {@link TransactionBuilder} that can be used to run queries inside a transaction.
@@ -285,8 +281,8 @@ class Kysely extends query_creator_js_1.QueryCreator {
      * @internal
      * @private
      */
-    get [private_symbols_js_1.PRIVATE_ADAPTER]() {
-        return this.#props.parseContext.adapter;
+    getExecutor() {
+        return this.#props.executor;
     }
 }
 exports.Kysely = Kysely;
@@ -333,8 +329,7 @@ function isKyselyProps(obj) {
         (0, object_utils_js_1.isObject)(obj.config) &&
         (0, object_utils_js_1.isObject)(obj.driver) &&
         (0, object_utils_js_1.isObject)(obj.executor) &&
-        (0, object_utils_js_1.isObject)(obj.dialect) &&
-        (0, object_utils_js_1.isObject)(obj.parseContext));
+        (0, object_utils_js_1.isObject)(obj.dialect));
 }
 exports.isKyselyProps = isKyselyProps;
 class ConnectionBuilder {
@@ -343,18 +338,14 @@ class ConnectionBuilder {
         this.#props = (0, object_utils_js_1.freeze)(props);
     }
     async execute(callback) {
-        const connection = await this.#props.driver.acquireConnection();
-        const connectionProvider = new single_connection_provider_js_1.SingleConnectionProvider(connection);
-        const db = new Kysely({
-            ...this.#props,
-            executor: this.#props.executor.withConnectionProvider(connectionProvider),
-        });
-        try {
+        return this.#props.executor.provideConnection(async (connection) => {
+            const executor = this.#props.executor.withConnectionProvider(new single_connection_provider_js_1.SingleConnectionProvider(connection));
+            const db = new Kysely({
+                ...this.#props,
+                executor,
+            });
             return await callback(db);
-        }
-        finally {
-            await this.#props.driver.releaseConnection(connection);
-        }
+        });
     }
 }
 exports.ConnectionBuilder = ConnectionBuilder;
@@ -374,25 +365,23 @@ class TransactionBuilder {
         const { isolationLevel, ...kyselyProps } = this.#props;
         const settings = { isolationLevel };
         validateTransactionSettings(settings);
-        const connection = await this.#props.driver.acquireConnection();
-        const connectionProvider = new single_connection_provider_js_1.SingleConnectionProvider(connection);
-        const transaction = new Transaction({
-            ...kyselyProps,
-            executor: this.#props.executor.withConnectionProvider(connectionProvider),
+        return this.#props.executor.provideConnection(async (connection) => {
+            const executor = this.#props.executor.withConnectionProvider(new single_connection_provider_js_1.SingleConnectionProvider(connection));
+            const transaction = new Transaction({
+                ...kyselyProps,
+                executor,
+            });
+            try {
+                await this.#props.driver.beginTransaction(connection, settings);
+                const result = await callback(transaction);
+                await this.#props.driver.commitTransaction(connection);
+                return result;
+            }
+            catch (error) {
+                await this.#props.driver.rollbackTransaction(connection);
+                throw error;
+            }
         });
-        try {
-            await this.#props.driver.beginTransaction(connection, settings);
-            const result = await callback(transaction);
-            await this.#props.driver.commitTransaction(connection);
-            return result;
-        }
-        catch (error) {
-            await this.#props.driver.rollbackTransaction(connection);
-            throw error;
-        }
-        finally {
-            await this.#props.driver.releaseConnection(connection);
-        }
     }
 }
 exports.TransactionBuilder = TransactionBuilder;

package/dist/cjs/migration/migrator.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Migrator = exports.NO_MIGRATIONS = exports.MIGRATION_LOCK_ID = exports.MIGRATION_LOCK_TABLE = exports.MIGRATION_TABLE = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
-const private_symbols_js_1 = require("../util/private-symbols.js");
 exports.MIGRATION_TABLE = 'kysely_migration';
 exports.MIGRATION_LOCK_TABLE = 'kysely_migration_lock';
 exports.MIGRATION_LOCK_ID = 'migration_lock';
@@ -262,9 +261,10 @@ class Migrator {
         return !!lockRow;
     }
     async #runMigrations(getTargetMigrationIndex) {
+        const adapter = this.#props.db.getExecutor().adapter;
         const run = async (db) => {
             try {
-                await this.#props.db[private_symbols_js_1.PRIVATE_ADAPTER].acquireMigrationLock(db);
+                await adapter.acquireMigrationLock(db);
                 const state = await this.#getState(db);
                 if (state.migrations.length === 0) {
                     return { results: [] };
@@ -282,10 +282,10 @@ class Migrator {
                 return { results: [] };
             }
             finally {
-                await this.#props.db[private_symbols_js_1.PRIVATE_ADAPTER].releaseMigrationLock(db);
+                await adapter.releaseMigrationLock(db);
             }
         };
-        if (this.#props.db[private_symbols_js_1.PRIVATE_ADAPTER].supportsTransactionalDdl) {
+        if (adapter.supportsTransactionalDdl) {
             return this.#props.db.transaction().execute(run);
         }
         else {

package/dist/cjs/operation-node/operation-node-transformer.js

@@ -220,7 +220,7 @@ class OperationNodeTransformer {
         return {
             kind: 'RawNode',
             sqlFragments: (0, object_utils_js_1.freeze)([...node.sqlFragments]),
-            params: this.transformNodeList(node.params),
+            parameters: this.transformNodeList(node.parameters),
         };
     }
     transformWhere(node) {

package/dist/cjs/operation-node/raw-node.d.ts

@@ -2,13 +2,15 @@ import { OperationNode } from './operation-node.js';
 export interface RawNode extends OperationNode {
     readonly kind: 'RawNode';
     readonly sqlFragments: ReadonlyArray<string>;
-    readonly params: ReadonlyArray<OperationNode>;
+    readonly parameters: ReadonlyArray<OperationNode>;
 }
 /**
  * @internal
  */
 export declare const RawNode: Readonly<{
     is(node: OperationNode): node is RawNode;
-    create(sqlFragments: ReadonlyArray<string>, params: ReadonlyArray<OperationNode>): RawNode;
+    create(sqlFragments: ReadonlyArray<string>, parameters: ReadonlyArray<OperationNode>): RawNode;
     createWithSql(sql: string): RawNode;
+    createWithChild(child: OperationNode): RawNode;
+    createWithChildren(children: ReadonlyArray<OperationNode>): RawNode;
 }>;

package/dist/cjs/operation-node/raw-node.js

@@ -9,14 +9,20 @@ exports.RawNode = (0, object_utils_js_1.freeze)({
     is(node) {
         return node.kind === 'RawNode';
     },
-    create(sqlFragments, params) {
+    create(sqlFragments, parameters) {
         return (0, object_utils_js_1.freeze)({
             kind: 'RawNode',
             sqlFragments: (0, object_utils_js_1.freeze)(sqlFragments),
-            params: (0, object_utils_js_1.freeze)(params),
+            parameters: (0, object_utils_js_1.freeze)(parameters),
         });
     },
     createWithSql(sql) {
         return exports.RawNode.create([sql], []);
     },
+    createWithChild(child) {
+        return exports.RawNode.create(['', ''], [child]);
+    },
+    createWithChildren(children) {
+        return exports.RawNode.create(new Array(children.length + 1).fill(''), children);
+    },
 });

package/dist/cjs/parser/complex-expression-parser.d.ts

@@ -1,10 +1,10 @@
 import { AliasNode } from '../operation-node/alias-node.js';
 import { RawNode } from '../operation-node/raw-node.js';
 import { SelectQueryNode } from '../operation-node/select-query-node.js';
-import { AliasedQueryBuilderFactory, AliasedRawBuilderFactory, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, AnySelectQueryBuilder, AnyRawBuilder, SelectQueryBuilderFactory, RawBuilderFactory } from '../util/type-utils.js';
-import { ParseContext } from './parse-context.js';
-export declare type ComplexExpression<DB, TB extends keyof DB> = AnySelectQueryBuilder | SelectQueryBuilderFactory<DB, TB> | AnyRawBuilder | RawBuilderFactory<DB, TB>;
+import { RawBuilder } from '../raw-builder/raw-builder.js';
+import { AliasedQueryBuilderFactory, AliasedRawBuilderFactory, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, AnySelectQueryBuilder, SelectQueryBuilderFactory, RawBuilderFactory } from '../util/type-utils.js';
+export declare type ComplexExpression<DB, TB extends keyof DB, V = any> = AnySelectQueryBuilder | SelectQueryBuilderFactory<DB, TB> | RawBuilder<V> | RawBuilderFactory<DB, TB>;
 export declare type AliasedComplexExpression<DB, TB extends keyof DB> = AnyAliasedQueryBuilder | AliasedQueryBuilderFactory<DB, TB> | AnyAliasedRawBuilder | AliasedRawBuilderFactory<DB, TB>;
-export declare function parseComplexExpression(ctx: ParseContext, exp: ComplexExpression<any, any>): SelectQueryNode | RawNode;
-export declare function parseAliasedComplexExpression(ctx: ParseContext, exp: AliasedComplexExpression<any, any>): AliasNode;
+export declare function parseComplexExpression(exp: ComplexExpression<any, any>): SelectQueryNode | RawNode;
+export declare function parseAliasedComplexExpression(exp: AliasedComplexExpression<any, any>): AliasNode;
 export declare function isComplexExpression(obj: unknown): obj is ComplexExpression<any, any>;

package/dist/cjs/parser/complex-expression-parser.js

@@ -3,22 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isComplexExpression = exports.parseAliasedComplexExpression = exports.parseComplexExpression = void 0;
 const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
 const object_utils_js_1 = require("../util/object-utils.js");
-function parseComplexExpression(ctx, exp) {
+const parse_utils_js_1 = require("./parse-utils.js");
+function parseComplexExpression(exp) {
     if ((0, operation_node_source_js_1.isOperationNodeSource)(exp)) {
         return exp.toOperationNode();
     }
     else if ((0, object_utils_js_1.isFunction)(exp)) {
-        return exp(ctx.createExpressionBuilder()).toOperationNode();
+        return exp((0, parse_utils_js_1.createExpressionBuilder)()).toOperationNode();
     }
     throw new Error(`invalid expression: ${JSON.stringify(exp)}`);
 }
 exports.parseComplexExpression = parseComplexExpression;
-function parseAliasedComplexExpression(ctx, exp) {
+function parseAliasedComplexExpression(exp) {
     if ((0, operation_node_source_js_1.isOperationNodeSource)(exp)) {
         return exp.toOperationNode();
     }
     else if ((0, object_utils_js_1.isFunction)(exp)) {
-        return exp(ctx.createExpressionBuilder()).toOperationNode();
+        return exp((0, parse_utils_js_1.createExpressionBuilder)()).toOperationNode();
     }
     throw new Error(`invalid aliased expression: ${JSON.stringify(exp)}`);
 }

package/dist/cjs/parser/filter-parser.d.ts

@@ -4,21 +4,21 @@ import { Operator } from '../operation-node/operator-node.js';
 import { ExtractTypeFromReferenceExpression, ReferenceExpression } from './reference-parser.js';
 import { ValueExpression, ValueExpressionOrList } from './value-parser.js';
 import { FilterExpressionNode } from '../operation-node/operation-node-utils.js';
-import { ParseContext } from './parse-context.js';
 import { WhereInterface } from '../query-builder/where-interface.js';
 import { HavingInterface } from '../query-builder/having-interface.js';
+import { ComplexExpression } from './complex-expression-parser.js';
 export declare type FilterValueExpression<DB, TB extends keyof DB, RE> = ValueExpression<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
 export declare type FilterValueExpressionOrList<DB, TB extends keyof DB, RE> = ValueExpressionOrList<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
-export declare type ExistsExpression<DB, TB extends keyof DB> = ValueExpression<DB, TB, never>;
+export declare type ExistsExpression<DB, TB extends keyof DB> = ComplexExpression<DB, TB, any>;
 export declare type WhereGrouper<DB, TB extends keyof DB> = (qb: WhereInterface<DB, TB>) => WhereInterface<DB, TB>;
 export declare type HavingGrouper<DB, TB extends keyof DB> = (qb: HavingInterface<DB, TB>) => HavingInterface<DB, TB>;
 export declare type FilterOperator = Operator | AnyRawBuilder;
 declare type FilterType = 'where' | 'having' | 'on';
-export declare function parseWhereFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
-export declare function parseHavingFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
-export declare function parseOnFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
-export declare function parseReferenceFilter(ctx: ParseContext, lhs: ReferenceExpression<any, any>, op: FilterOperator, rhs: ReferenceExpression<any, any>): FilterNode;
-export declare function parseExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
-export declare function parseNotExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
-export declare function parseFilter(ctx: ParseContext, type: FilterType, args: any[]): FilterExpressionNode;
+export declare function parseWhereFilter(args: any[]): FilterExpressionNode;
+export declare function parseHavingFilter(args: any[]): FilterExpressionNode;
+export declare function parseOnFilter(args: any[]): FilterExpressionNode;
+export declare function parseReferenceFilter(lhs: ReferenceExpression<any, any>, op: FilterOperator, rhs: ReferenceExpression<any, any>): FilterNode;
+export declare function parseExistFilter(arg: ExistsExpression<any, any>): FilterNode;
+export declare function parseNotExistFilter(arg: ExistsExpression<any, any>): FilterNode;
+export declare function parseFilter(type: FilterType, args: any[]): FilterExpressionNode;
 export {};