kysely 0.16.8 → 0.17.0

package/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2022 Sami Koskimäki
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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).
@@ -204,14 +204,24 @@ export async function down(db: Kysely<any>): Promise<void> {
 ```
 
 The `up` function is called when you update your database schema to next version and `down`
-when you go back to previous version. The only argument to the functions is an instance of
-`Kysely<any>`. It is important to use `Kysely<any>` and not `Kysely<YourDatabase>`. Migrations
-should never depend on the current code of your app because they need to work even if the app
-changes completely. Migrations need to be "frozen in time".
+when you go back to previous version. The only argument for the functions is an instance of
+`Kysely<any>`. It's important to use `Kysely<any>` and not `Kysely<YourDatabase>`. Migrations
+should never depend on the current code of your app because they need to work even when the app
+changes. Migrations need to be "frozen in time".
 
 The migrations can use the [Kysely.schema](https://koskimas.github.io/kysely/classes/SchemaModule.html)
 module to modify the schema. Migrations can also run normal queries to modify data.
 
+Execution order of the migrations is the alpabetical order of their names. An excellent way to name your
+migrations is to prefix them with an ISO 8601 date string. A date prefix works well in large teams
+where multiple team members may add migrations at the same time in parallel commits without knowing
+about the other migrations.
+
+You don't need to store your migrations as separate files if you don't want to. You can easily
+implement your own [MigrationProvider](https://koskimas.github.io/kysely/interfaces/MigrationProvider.html)
+and give it to the [Migrator](https://koskimas.github.io/kysely/classes/Migrator.html) class
+when you instantiate one.
+
 ### PostgreSQL migration example
 
 ```ts
@@ -295,9 +305,9 @@ const migrator = new Migrator(migratorConfig);
 await migrator.migrateToLatest(pathToMigrationsFolder)
 ```
 
-to run all migrations that have not yet been run. The migrations are executed in alphabetical
-order by their name. See the [Migrator](https://koskimas.github.io/kysely/classes/Migrator.html) 
-documentation for more info.
+to run all migrations that have not yet been run. See the
+[Migrator](https://koskimas.github.io/kysely/classes/Migrator.html)
+class's documentation for more info.
 
 Kysely doesn't have a CLI for running migrations and probably never will. This is because Kysely's
 migrations are also written in typescript. To run the migrations, you need to first build the
@@ -352,9 +362,11 @@ async function migrateToLatest() {
 migrateToLatest()
 ```
 
-The migration methods use a lock on the database level, and parallel calls are executed serially.
+The migration methods use a lock on the database level and parallel calls are executed serially.
 This means that you can safely call `migrateToLatest` and other migration methods from multiple
-server instances simultaneously and the migrations are guaranteed to only be executed once.
+server instances simultaneously and the migrations are guaranteed to only be executed once. The
+locks are also automatically released if the migration process crashes or the connection to the
+database fails.
 
 # Deno
 

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-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/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 {
@@ -345,12 +340,12 @@ class ConnectionBuilder {
     async execute(callback) {
         const connection = await this.#props.driver.acquireConnection();
         const connectionProvider = new single_connection_provider_js_1.SingleConnectionProvider(connection);
-        const transaction = new Kysely({
+        const db = new Kysely({
             ...this.#props,
             executor: this.#props.executor.withConnectionProvider(connectionProvider),
         });
         try {
-            return await callback(transaction);
+            return await callback(db);
         }
         finally {
             await this.#props.driver.releaseConnection(connection);

package/dist/cjs/migration/migrator.d.ts

@@ -36,6 +36,12 @@ export interface Migration {
 export declare class Migrator {
     #private;
     constructor(props: MigratorProps);
+    /**
+     * Returns a {@link MigrationInfo} object for each migration.
+     *
+     * The returned array is sorted by migration name.
+     */
+    getMigrations(): Promise<ReadonlyArray<MigrationInfo>>;
     /**
      * Runs all migrations that have not yet been run.
      *
@@ -219,3 +225,19 @@ export interface MigrationProvider {
 export interface NoMigrations {
     readonly __noMigrations__: true;
 }
+export interface MigrationInfo {
+    /**
+     * Name of the migration.
+     */
+    name: string;
+    /**
+     * The actual migration.
+     */
+    migration: Migration;
+    /**
+     * When was the migration executed.
+     *
+     * If this is undefined, the migration hasn't been executed yet.
+     */
+    executedAt?: Date;
+}

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';
@@ -32,6 +31,28 @@ class Migrator {
     constructor(props) {
         this.#props = (0, object_utils_js_1.freeze)(props);
     }
+    /**
+     * Returns a {@link MigrationInfo} object for each migration.
+     *
+     * The returned array is sorted by migration name.
+     */
+    async getMigrations() {
+        const executedMigrations = (await this.#doesTableExists(exports.MIGRATION_TABLE))
+            ? await this.#props.db
+                .selectFrom(exports.MIGRATION_TABLE)
+                .select(['name', 'timestamp'])
+                .execute()
+            : [];
+        const migrations = await this.#resolveMigrations();
+        return migrations.map(({ name, ...migration }) => {
+            const executed = executedMigrations.find((it) => it.name === name);
+            return {
+                name,
+                migration,
+                executedAt: executed ? new Date(executed.timestamp) : undefined,
+            };
+        });
+    }
     /**
      * Runs all migrations that have not yet been run.
      *
@@ -215,7 +236,7 @@ class Migrator {
             try {
                 await this.#props.db
                     .insertInto(exports.MIGRATION_LOCK_TABLE)
-                    .values({ id: exports.MIGRATION_LOCK_ID })
+                    .values({ id: exports.MIGRATION_LOCK_ID, is_locked: 0 })
                     .execute();
             }
             catch (error) {
@@ -240,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: [] };
@@ -260,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/delete-query-node.d.ts

@@ -5,6 +5,9 @@ import { TableExpressionNode } from './operation-node-utils.js';
 import { ReturningNode } from './returning-node.js';
 import { WhereNode } from './where-node.js';
 import { WithNode } from './with-node.js';
+import { LimitNode } from './limit-node.js';
+import { OrderByNode } from './order-by-node.js';
+import { OrderByItemNode } from './order-by-item-node.js';
 export interface DeleteQueryNode extends OperationNode {
     readonly kind: 'DeleteQueryNode';
     readonly from: FromNode;
@@ -12,6 +15,8 @@ export interface DeleteQueryNode extends OperationNode {
     readonly where?: WhereNode;
     readonly returning?: ReturningNode;
     readonly with?: WithNode;
+    readonly orderBy?: OrderByNode;
+    readonly limit?: LimitNode;
 }
 /**
  * @internal
@@ -19,4 +24,6 @@ export interface DeleteQueryNode extends OperationNode {
 export declare const DeleteQueryNode: Readonly<{
     is(node: OperationNode): node is DeleteQueryNode;
     create(fromItem: TableExpressionNode, withNode?: WithNode | undefined): DeleteQueryNode;
+    cloneWithOrderByItem(deleteNode: DeleteQueryNode, item: OrderByItemNode): DeleteQueryNode;
+    cloneWithLimit(deleteNode: DeleteQueryNode, limit: LimitNode): DeleteQueryNode;
 }>;

package/dist/cjs/operation-node/delete-query-node.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteQueryNode = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
 const from_node_js_1 = require("./from-node.js");
+const order_by_node_js_1 = require("./order-by-node.js");
 /**
  * @internal
  */
@@ -17,4 +18,18 @@ exports.DeleteQueryNode = (0, object_utils_js_1.freeze)({
             ...(withNode && { with: withNode }),
         });
     },
+    cloneWithOrderByItem(deleteNode, item) {
+        return (0, object_utils_js_1.freeze)({
+            ...deleteNode,
+            orderBy: deleteNode.orderBy
+                ? order_by_node_js_1.OrderByNode.cloneWithItem(deleteNode.orderBy, item)
+                : order_by_node_js_1.OrderByNode.create(item),
+        });
+    },
+    cloneWithLimit(deleteNode, limit) {
+        return (0, object_utils_js_1.freeze)({
+            ...deleteNode,
+            limit,
+        });
+    },
 });

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 { RawBuilder } from '../index-nodeless.js';
 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 { 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 {};