kysely 0.21.6 → 0.23.0

package/dist/cjs/query-builder/where-interface.d.ts

@@ -1,6 +1,7 @@
-import { ExistsExpression, FilterOperator, FilterValueExpressionOrList, WhereGrouper } from '../parser/filter-parser.js';
+import { Expression } from '../expression/expression.js';
+import { ComparisonOperatorExpression, OperandValueExpressionOrList, WhereGrouper } from '../parser/binary-operation-parser.js';
 import { ReferenceExpression } from '../parser/reference-parser.js';
-import { AnyRawBuilder } from '../util/type-utils.js';
+import { ExistsExpression } from '../parser/unary-operation-parser.js';
 export interface WhereInterface<DB, TB extends keyof DB> {
     /**
      * Adds a `where` clause to the query.
@@ -186,16 +187,16 @@ export interface WhereInterface<DB, TB extends keyof DB> {
      *   .execute()
      * ```
      */
-    where<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: FilterOperator, rhs: FilterValueExpressionOrList<DB, TB, RE>): WhereInterface<DB, TB>;
+    where<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: ComparisonOperatorExpression, rhs: OperandValueExpressionOrList<DB, TB, RE>): WhereInterface<DB, TB>;
     where(grouper: WhereGrouper<DB, TB>): WhereInterface<DB, TB>;
-    where(raw: AnyRawBuilder): WhereInterface<DB, TB>;
+    where(expression: Expression<any>): WhereInterface<DB, TB>;
     /**
      * Adds a `where` clause where both sides of the operator are references
      * to columns.
      *
      * The normal `where` method treats the right hand side argument as a
      * value by default. `whereRef` treats it as a column reference. This method is
-     * expecially useful with joins and correclated subqueries.
+     * expecially useful with joins and correlated subqueries.
      *
      * ### Examples
      *
@@ -240,7 +241,7 @@ export interface WhereInterface<DB, TB extends keyof DB> {
      * ) as "pet_name"
      * from "person"
      */
-    whereRef(lhs: ReferenceExpression<DB, TB>, op: FilterOperator, rhs: ReferenceExpression<DB, TB>): WhereInterface<DB, TB>;
+    whereRef(lhs: ReferenceExpression<DB, TB>, op: ComparisonOperatorExpression, rhs: ReferenceExpression<DB, TB>): WhereInterface<DB, TB>;
     /**
      * Adds an `or where` clause to the query. Otherwise works just like {@link where}.
      *
@@ -304,15 +305,15 @@ export interface WhereInterface<DB, TB extends keyof DB> {
      * select * from "person" (where "id" = 1 or "id" = 2)
      * ```
      */
-    orWhere<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: FilterOperator, rhs: FilterValueExpressionOrList<DB, TB, RE>): WhereInterface<DB, TB>;
+    orWhere<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: ComparisonOperatorExpression, rhs: OperandValueExpressionOrList<DB, TB, RE>): WhereInterface<DB, TB>;
     orWhere(grouper: WhereGrouper<DB, TB>): WhereInterface<DB, TB>;
-    orWhere(raw: AnyRawBuilder): WhereInterface<DB, TB>;
+    orWhere(expression: Expression<any>): WhereInterface<DB, TB>;
     /**
      * Adds an `or where` clause to the query. Otherwise works just like {@link whereRef}.
      *
      * Also see {@link orWhere} and {@link where}.
      */
-    orWhereRef(lhs: ReferenceExpression<DB, TB>, op: FilterOperator, rhs: ReferenceExpression<DB, TB>): WhereInterface<DB, TB>;
+    orWhereRef(lhs: ReferenceExpression<DB, TB>, op: ComparisonOperatorExpression, rhs: ReferenceExpression<DB, TB>): WhereInterface<DB, TB>;
     /**
      * Adds a `where exists` clause to the query.
      *
@@ -379,11 +380,11 @@ export interface WhereInterface<DB, TB extends keyof DB> {
      */
     whereNotExists(arg: ExistsExpression<DB, TB>): WhereInterface<DB, TB>;
     /**
-     * Just like {@link whereExists} but creates a `or exists` clause.
+     * Just like {@link whereExists} but creates an `or exists` clause.
      */
     orWhereExists(arg: ExistsExpression<DB, TB>): WhereInterface<DB, TB>;
     /**
-     * Just like {@link whereExists} but creates a `or not exists` clause.
+     * Just like {@link whereExists} but creates an `or not exists` clause.
      */
     orWhereNotExists(arg: ExistsExpression<DB, TB>): WhereInterface<DB, TB>;
 }

package/dist/cjs/query-compiler/compiled-query.d.ts

@@ -1,5 +1,5 @@
 import { RootOperationNode } from './query-compiler.js';
-export interface CompiledQuery {
+export interface CompiledQuery<O = unknown> {
     readonly query: RootOperationNode;
     readonly sql: string;
     readonly parameters: ReadonlyArray<unknown>;

package/dist/cjs/query-compiler/default-query-compiler.d.ts

@@ -9,7 +9,6 @@ import { DataTypeNode } from '../operation-node/data-type-node.js';
 import { DeleteQueryNode } from '../operation-node/delete-query-node.js';
 import { DropIndexNode } from '../operation-node/drop-index-node.js';
 import { DropTableNode } from '../operation-node/drop-table-node.js';
-import { FilterNode } from '../operation-node/filter-node.js';
 import { FromNode } from '../operation-node/from-node.js';
 import { GroupByItemNode } from '../operation-node/group-by-item-node.js';
 import { GroupByNode } from '../operation-node/group-by-node.js';
@@ -60,7 +59,6 @@ import { ColumnDefinitionNode } from '../operation-node/column-definition-node.j
 import { ModifyColumnNode } from '../operation-node/modify-column-node.js';
 import { OnDuplicateKeyNode } from '../operation-node/on-duplicate-key-node.js';
 import { ColumnNode } from '../operation-node/column-node.js';
-import { UnionNode } from '../operation-node/union-node.js';
 import { CreateViewNode } from '../operation-node/create-view-node.js';
 import { DropViewNode } from '../operation-node/drop-view-node.js';
 import { GeneratedNode } from '../operation-node/generated-node.js';
@@ -74,6 +72,13 @@ import { DropTypeNode } from '../operation-node/drop-type-node.js';
 import { ExplainNode } from '../operation-node/explain-node.js';
 import { SchemableIdentifierNode } from '../operation-node/schemable-identifier-node.js';
 import { DefaultInsertValueNode } from '../operation-node/default-insert-value-node.js';
+import { AggregateFunctionNode } from '../operation-node/aggregate-function-node.js';
+import { OverNode } from '../operation-node/over-node.js';
+import { PartitionByNode } from '../operation-node/partition-by-node.js';
+import { PartitionByItemNode } from '../operation-node/partition-by-item-node.js';
+import { SetOperationNode } from '../operation-node/set-operation-node.js';
+import { BinaryOperationNode } from '../operation-node/binary-operation-node.js';
+import { UnaryOperationNode } from '../operation-node/unary-operation-node.js';
 export declare class DefaultQueryCompiler extends OperationNodeVisitor implements QueryCompiler {
     #private;
     protected get numParameters(): number;
@@ -83,7 +88,7 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected visitFrom(node: FromNode): void;
     protected visitSelection(node: SelectionNode): void;
     protected visitColumn(node: ColumnNode): void;
-    protected compileDistinctOn(selections: ReadonlyArray<SelectionNode>): void;
+    protected compileDistinctOn(expressions: ReadonlyArray<OperationNode>): void;
     protected compileList(nodes: ReadonlyArray<OperationNode>, separator?: string): void;
     protected visitWhere(node: WhereNode): void;
     protected visitHaving(node: HavingNode): void;
@@ -96,7 +101,6 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected visitSelectAll(_: SelectAllNode): void;
     protected visitIdentifier(node: IdentifierNode): void;
     protected compileUnwrappedIdentifier(node: IdentifierNode): void;
-    protected visitFilter(node: FilterNode): void;
     protected visitAnd(node: AndNode): void;
     protected visitOr(node: OrNode): void;
     protected visitValue(node: ValueNode): void;
@@ -145,7 +149,7 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected visitModifyColumn(node: ModifyColumnNode): void;
     protected visitAddConstraint(node: AddConstraintNode): void;
     protected visitDropConstraint(node: DropConstraintNode): void;
-    protected visitUnion(node: UnionNode): void;
+    protected visitSetOperation(node: SetOperationNode): void;
     protected visitCreateView(node: CreateViewNode): void;
     protected visitDropView(node: DropViewNode): void;
     protected visitGenerated(node: GeneratedNode): void;
@@ -155,6 +159,12 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected visitDropType(node: DropTypeNode): void;
     protected visitExplain(node: ExplainNode): void;
     protected visitDefaultInsertValue(_: DefaultInsertValueNode): void;
+    protected visitAggregateFunction(node: AggregateFunctionNode): void;
+    protected visitOver(node: OverNode): void;
+    protected visitPartitionBy(node: PartitionByNode): void;
+    protected visitPartitionByItem(node: PartitionByItemNode): void;
+    protected visitBinaryOperation(node: BinaryOperationNode): void;
+    protected visitUnaryOperation(node: UnaryOperationNode): void;
     protected append(str: string): void;
     protected appendValue(parameter: unknown): void;
     protected getLeftIdentifierWrapper(): string;

package/dist/cjs/query-compiler/default-query-compiler.js

@@ -4,10 +4,9 @@ exports.DefaultQueryCompiler = void 0;
 const insert_query_node_js_1 = require("../operation-node/insert-query-node.js");
 const operation_node_visitor_js_1 = require("../operation-node/operation-node-visitor.js");
 const query_node_js_1 = require("../operation-node/query-node.js");
-const raw_node_js_1 = require("../operation-node/raw-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
-const union_node_js_1 = require("../operation-node/union-node.js");
 const create_view_node_js_1 = require("../operation-node/create-view-node.js");
+const set_operation_node_js_1 = require("../operation-node/set-operation-node.js");
 class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisitor {
     #sql = '';
     #parameters = [];
@@ -31,7 +30,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         const wrapInParens = this.parentNode !== undefined &&
             !insert_query_node_js_1.InsertQueryNode.is(this.parentNode) &&
             !create_view_node_js_1.CreateViewNode.is(this.parentNode) &&
-            !union_node_js_1.UnionNode.is(this.parentNode);
+            !set_operation_node_js_1.SetOperationNode.is(this.parentNode);
         if (this.parentNode === undefined && node.explain) {
             this.visitNode(node.explain);
             this.append(' ');
@@ -44,8 +43,8 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' ');
         }
         this.append('select ');
-        if (node.distinctOnSelections) {
-            this.compileDistinctOn(node.distinctOnSelections);
+        if (node.distinctOn) {
+            this.compileDistinctOn(node.distinctOn);
             this.append(' ');
         }
         if (node.frontModifiers && node.frontModifiers.length > 0) {
@@ -73,9 +72,9 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' ');
             this.visitNode(node.having);
         }
-        if (node.union) {
+        if (node.setOperations) {
             this.append(' ');
-            this.compileList(node.union, ' ');
+            this.compileList(node.setOperations, ' ');
         }
         if (node.orderBy) {
             this.append(' ');
@@ -107,16 +106,16 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     visitColumn(node) {
         this.visitNode(node.column);
     }
-    compileDistinctOn(selections) {
+    compileDistinctOn(expressions) {
         this.append('distinct on (');
-        this.compileList(selections);
+        this.compileList(expressions);
         this.append(')');
     }
     compileList(nodes, separator = ', ') {
-        const lastNode = (0, object_utils_js_1.getLast)(nodes);
-        for (const node of nodes) {
-            this.visitNode(node);
-            if (node !== lastNode) {
+        const lastIndex = nodes.length - 1;
+        for (let i = 0; i <= lastIndex; i++) {
+            this.visitNode(nodes[i]);
+            if (i < lastIndex) {
                 this.append(separator);
             }
         }
@@ -244,15 +243,6 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         }
         this.append(this.sanitizeIdentifier(node.name));
     }
-    visitFilter(node) {
-        if (node.left) {
-            this.visitNode(node.left);
-            this.append(' ');
-        }
-        this.visitNode(node.op);
-        this.append(' ');
-        this.visitNode(node.right);
-    }
     visitAnd(node) {
         this.visitNode(node.left);
         this.append(' and ');
@@ -329,7 +319,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     }
     visitCreateTable(node) {
         this.append('create ');
-        if (node.frontModifiers) {
+        if (node.frontModifiers && node.frontModifiers.length > 0) {
             this.compileList(node.frontModifiers, ' ');
             this.append(' ');
         }
@@ -348,7 +338,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' on commit ');
             this.append(node.onCommit);
         }
-        if (node.endModifiers) {
+        if (node.endModifiers && node.endModifiers.length > 0) {
             this.append(' ');
             this.compileList(node.endModifiers, ' ');
         }
@@ -360,6 +350,10 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         if (node.unsigned) {
             this.append(' unsigned');
         }
+        if (node.frontModifiers && node.frontModifiers.length > 0) {
+            this.append(' ');
+            this.compileList(node.frontModifiers, ' ');
+        }
         if (node.generated) {
             this.append(' ');
             this.visitNode(node.generated);
@@ -389,6 +383,10 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' ');
             this.visitNode(node.check);
         }
+        if (node.endModifiers && node.endModifiers.length > 0) {
+            this.append(' ');
+            this.compileList(node.endModifiers, ' ');
+        }
     }
     getAutoIncrement() {
         return 'auto_increment';
@@ -544,13 +542,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         }
         if (node.expression) {
             this.append(' (');
-            if (raw_node_js_1.RawNode.is(node.expression)) {
-                this.append('(');
-            }
             this.visitNode(node.expression);
-            if (raw_node_js_1.RawNode.is(node.expression)) {
-                this.append(')');
-            }
             this.append(')');
         }
     }
@@ -675,20 +667,8 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         if (node.dropConstraint) {
             this.visitNode(node.dropConstraint);
         }
-        if (node.renameColumn) {
-            this.visitNode(node.renameColumn);
-        }
-        if (node.addColumn) {
-            this.visitNode(node.addColumn);
-        }
-        if (node.dropColumn) {
-            this.visitNode(node.dropColumn);
-        }
-        if (node.alterColumn) {
-            this.visitNode(node.alterColumn);
-        }
-        if (node.modifyColumn) {
-            this.visitNode(node.modifyColumn);
+        if (node.columnAlterations) {
+            this.compileList(node.columnAlterations);
         }
     }
     visitAddColumn(node) {
@@ -752,12 +732,13 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
             this.append(' restrict');
         }
     }
-    visitUnion(node) {
-        this.append('union ');
+    visitSetOperation(node) {
+        this.append(node.operator);
+        this.append(' ');
         if (node.all) {
             this.append('all ');
         }
-        this.visitNode(node.union);
+        this.visitNode(node.expression);
     }
     visitCreateView(node) {
         this.append('create ');
@@ -870,6 +851,56 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     visitDefaultInsertValue(_) {
         this.append('default');
     }
+    visitAggregateFunction(node) {
+        this.append(node.func);
+        this.append('(');
+        if (node.distinct) {
+            this.append('distinct ');
+        }
+        this.visitNode(node.column);
+        this.append(')');
+        if (node.filter) {
+            this.append(' filter(');
+            this.visitNode(node.filter);
+            this.append(')');
+        }
+        if (node.over) {
+            this.append(' ');
+            this.visitNode(node.over);
+        }
+    }
+    visitOver(node) {
+        this.append('over(');
+        if (node.partitionBy) {
+            this.visitNode(node.partitionBy);
+            if (node.orderBy) {
+                this.append(' ');
+            }
+        }
+        if (node.orderBy) {
+            this.visitNode(node.orderBy);
+        }
+        this.append(')');
+    }
+    visitPartitionBy(node) {
+        this.append('partition by ');
+        this.compileList(node.items);
+    }
+    visitPartitionByItem(node) {
+        this.visitNode(node.partitionBy);
+    }
+    visitBinaryOperation(node) {
+        this.visitNode(node.leftOperand);
+        this.append(' ');
+        this.visitNode(node.operator);
+        this.append(' ');
+        this.visitNode(node.rightOperand);
+    }
+    visitUnaryOperation(node) {
+        this.visitNode(node.operator);
+        this.append(' ');
+        this.visitNode(node.operand);
+    }
     append(str) {
         this.#sql += str;
     }

package/dist/cjs/query-executor/query-executor-base.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryExecutorBase = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
 const deferred_js_1 = require("../util/deferred.js");
+const log_once_js_1 = require("../util/log-once.js");
 const NO_PLUGINS = (0, object_utils_js_1.freeze)([]);
 class QueryExecutorBase {
     #plugins;
@@ -34,7 +35,10 @@ class QueryExecutorBase {
     async executeQuery(compiledQuery, queryId) {
         return await this.provideConnection(async (connection) => {
             const result = await connection.executeQuery(compiledQuery);
-            return this.#transformResult(result, queryId);
+            const transformedResult = await this.#transformResult(result, queryId);
+            // TODO: remove.
+            warnOfOutdatedDriverOrPlugins(result, transformedResult);
+            return transformedResult;
         });
     }
     async *stream(compiledQuery, chunkSize, queryId) {
@@ -63,3 +67,14 @@ class QueryExecutorBase {
     }
 }
 exports.QueryExecutorBase = QueryExecutorBase;
+// TODO: remove.
+function warnOfOutdatedDriverOrPlugins(result, transformedResult) {
+    const { numAffectedRows } = result;
+    if ((numAffectedRows === undefined &&
+        result.numUpdatedOrDeletedRows === undefined) ||
+        (numAffectedRows !== undefined &&
+            transformedResult.numAffectedRows !== undefined)) {
+        return;
+    }
+    (0, log_once_js_1.logOnce)('kysely:warning: outdated driver/plugin detected! QueryResult.numUpdatedOrDeletedRows is deprecated and will be removed in a future release.');
+}

package/dist/cjs/raw-builder/raw-builder.d.ts

@@ -1,20 +1,37 @@
 import { QueryResult } from '../driver/database-connection.js';
 import { AliasNode } from '../operation-node/alias-node.js';
-import { OperationNodeSource } from '../operation-node/operation-node-source.js';
 import { RawNode } from '../operation-node/raw-node.js';
 import { KyselyPlugin } from '../plugin/kysely-plugin.js';
 import { QueryExecutorProvider } from '../query-executor/query-executor-provider.js';
 import { QueryId } from '../util/query-id.js';
-import { AnyRawBuilder } from '../util/type-utils.js';
+import { AliasedExpression, Expression } from '../expression/expression.js';
 /**
  * An instance of this class can be used to create raw SQL snippets or queries.
  *
  * You shouldn't need to create `RawBuilder` instances directly. Instead you should
  * use the {@link sql} template tag.
  */
-export declare class RawBuilder<O = unknown> implements OperationNodeSource {
+export declare class RawBuilder<O> implements Expression<O> {
     #private;
     constructor(props: RawBuilderProps);
+    /** @private */
+    /**
+     * All expressions need to have this getter for complicated type-related reasons.
+     * Simply add this getter for your expression and always return `undefined` from it:
+     *
+     * ```ts
+     * class SomeExpression<T> implements Expression<T> {
+     *   get expressionType(): T | undefined {
+     *     return undefined
+     *   }
+     * }
+     * ```
+     *
+     * The getter is needed to make the expression assignable to another expression only
+     * if the types `T` are assignable. Without this property (or some other property
+     * that references `T`), you could assing `Expression<string>` to `Expression<number>`.
+     */
+    get expressionType(): O | undefined;
     /**
      * Returns an aliased version of the SQL expression.
      *
@@ -69,7 +86,7 @@ export declare class RawBuilder<O = unknown> implements OperationNodeSource {
      * ```
      */
     as<A extends string>(alias: A): AliasedRawBuilder<O, A>;
-    as<A extends string = never>(alias: AnyRawBuilder): AliasedRawBuilder<O, A>;
+    as<A extends string = never>(alias: Expression<any>): AliasedRawBuilder<O, A>;
     /**
      * Change the output type of the raw expression.
      *
@@ -81,25 +98,44 @@ export declare class RawBuilder<O = unknown> implements OperationNodeSource {
      * Adds a plugin for this SQL snippet.
      */
     withPlugin(plugin: KyselyPlugin): RawBuilder<O>;
+    /**
+     * Creates the OperationNode that describes how to compile this expression into SQL.
+     *
+     * If you are creating a custom expression, it's often easiest to use the {@link sql}
+     * template tag to build the node:
+     *
+     * ```ts
+     * class SomeExpression<T> implements Expression<T> {
+     *   toOperationNode(): OperationNode {
+     *     return sql`some sql here`.toOperationNode()
+     *   }
+     * }
+     * ```
+     */
     toOperationNode(): RawNode;
     execute(executorProvider: QueryExecutorProvider): Promise<QueryResult<O>>;
 }
+export declare function isRawBuilder(obj: unknown): obj is RawBuilder<unknown>;
 /**
  * {@link RawBuilder} with an alias. The result of calling {@link RawBuilder.as}.
  */
-export declare class AliasedRawBuilder<O = unknown, A extends string = never> implements OperationNodeSource {
+export declare class AliasedRawBuilder<O = unknown, A extends string = never> implements AliasedExpression<O, A> {
     #private;
+    constructor(rawBuilder: RawBuilder<O>, alias: A | Expression<any>);
+    /** @private */
     /**
-     * @private
-     *
-     * This needs to be here just so that the typings work. Without this
-     * the generated .d.ts file contains no reference to the type param A
-     * which causes this type to be equal to AliasedRawBuilder with any A
-     * as long as O is the same.
+     * Returns the aliased expression.
+     */
+    get expression(): Expression<O>;
+    /** @private */
+    /**
+     * Returns the alias.
+     */
+    get alias(): A;
+    /**
+     * Creates the OperationNode that describes how to compile this expression into SQL.
      */
-    protected get alias(): A | AnyRawBuilder;
     toOperationNode(): AliasNode;
-    constructor(rawBuilder: RawBuilder<O>, alias: A | AnyRawBuilder);
 }
 export interface RawBuilderProps {
     readonly queryId: QueryId;

package/dist/cjs/raw-builder/raw-builder.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AliasedRawBuilder = exports.RawBuilder = void 0;
+exports.AliasedRawBuilder = exports.isRawBuilder = exports.RawBuilder = void 0;
 const alias_node_js_1 = require("../operation-node/alias-node.js");
-const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
 const prevent_await_js_1 = require("../util/prevent-await.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 const noop_query_executor_js_1 = require("../query-executor/noop-query-executor.js");
 const identifier_node_js_1 = require("../operation-node/identifier-node.js");
+const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
 /**
  * An instance of this class can be used to create raw SQL snippets or queries.
  *
@@ -18,6 +18,10 @@ class RawBuilder {
     constructor(props) {
         this.#props = (0, object_utils_js_1.freeze)(props);
     }
+    /** @private */
+    get expressionType() {
+        return undefined;
+    }
     as(alias) {
         return new AliasedRawBuilder(this, alias);
     }
@@ -61,6 +65,15 @@ class RawBuilder {
     }
 }
 exports.RawBuilder = RawBuilder;
+function isRawBuilder(obj) {
+    return ((0, object_utils_js_1.isObject)(obj) &&
+        (0, object_utils_js_1.isFunction)(obj.as) &&
+        (0, object_utils_js_1.isFunction)(obj.castTo) &&
+        (0, object_utils_js_1.isFunction)(obj.withPlugin) &&
+        (0, object_utils_js_1.isFunction)(obj.toOperationNode) &&
+        (0, object_utils_js_1.isFunction)(obj.execute));
+}
+exports.isRawBuilder = isRawBuilder;
 (0, prevent_await_js_1.preventAwait)(RawBuilder, "don't await RawBuilder instances directly. To execute the query you need to call `execute`");
 /**
  * {@link RawBuilder} with an alias. The result of calling {@link RawBuilder.as}.
@@ -68,14 +81,15 @@ exports.RawBuilder = RawBuilder;
 class AliasedRawBuilder {
     #rawBuilder;
     #alias;
-    /**
-     * @private
-     *
-     * This needs to be here just so that the typings work. Without this
-     * the generated .d.ts file contains no reference to the type param A
-     * which causes this type to be equal to AliasedRawBuilder with any A
-     * as long as O is the same.
-     */
+    constructor(rawBuilder, alias) {
+        this.#rawBuilder = rawBuilder;
+        this.#alias = alias;
+    }
+    /** @private */
+    get expression() {
+        return this.#rawBuilder;
+    }
+    /** @private */
     get alias() {
         return this.#alias;
     }
@@ -84,9 +98,5 @@ class AliasedRawBuilder {
             ? this.#alias.toOperationNode()
             : identifier_node_js_1.IdentifierNode.create(this.#alias));
     }
-    constructor(rawBuilder, alias) {
-        this.#rawBuilder = rawBuilder;
-        this.#alias = alias;
-    }
 }
 exports.AliasedRawBuilder = AliasedRawBuilder;

package/dist/cjs/raw-builder/sql.d.ts

@@ -7,13 +7,14 @@ export interface Sql {
      * import { sql } from 'kysely'
      *
      * const id = 123
-     *
      * const snippet = sql<Person[]>`select * from person where id = ${id}`
      * ```
      *
      * Substitutions (the things inside `${}`) are automatically passed to the database
-     * as parameters and are NOT interpolated to the SQL string. There's no need to worry
-     * about SQL injection vulnerabilities.
+     * as parameters and are never interpolated to the SQL string. There's no need to worry
+     * about SQL injection vulnerabilities. Substitutions can be values, other `sql`
+     * expressions, queries and almost anything else Kysely can produce and they get
+     * handled correctly. See the examples below.
      *
      * If you need your substitutions to be interpreted as identifiers, value literals or
      * lists of things, see the {@link Sql.ref}, {@link Sql.table}, {@link Sql.id},
@@ -29,8 +30,7 @@ export interface Sql {
      *   .selectFrom('person')
      *   .select(
      *     // If you use `sql` in a select statement, remember to call the `as`
-     *     // method to give it an alias. Otherwise Kysely is not able to add
-     *     // the column to the result type.
+     *     // method to give it an alias.
      *     sql<string>`concat(first_name, ' ', last_name)`.as('full_name')
      *   )
      *   .where(sql`birthdate between ${date1} and ${date2}`)
@@ -97,6 +97,14 @@ export interface Sql {
      * type-safety though... But it's possible.
      */
     <T = unknown>(sqlFragments: TemplateStringsArray, ...parameters: unknown[]): RawBuilder<T>;
+    /**
+     * `sql.value(value)` is a shortcut for:
+     *
+     * ```ts
+     * sql<ValueType>`${value}`
+     * ```
+     */
+    value<T>(value: T): RawBuilder<T>;
     /**
      * This can be used to add runtime column references to SQL snippets.
      *
@@ -226,7 +234,7 @@ export interface Sql {
      * select "public"."person"."first_name" from "public"."person"
      * ```
      */
-    id(...ids: string[]): RawBuilder<unknown>;
+    id(...ids: readonly string[]): RawBuilder<unknown>;
     /**
      * This can be used to add literal values to SQL snippets.
      *
@@ -326,6 +334,6 @@ export interface Sql {
      * BEFORE $1::varchar, (1 == 1)::varchar, (select * from "person")::varchar, false::varchar, "first_name" AFTER
      * ```
      */
-    join(array: unknown[], separator?: RawBuilder<any>): RawBuilder<unknown>;
+    join(array: readonly unknown[], separator?: RawBuilder<any>): RawBuilder<unknown>;
 }
 export declare const sql: Sql;

package/dist/cjs/raw-builder/sql.js

@@ -21,6 +21,12 @@ exports.sql = Object.assign((sqlFragments, ...parameters) => {
             rawNode: raw_node_js_1.RawNode.createWithChild((0, reference_parser_js_1.parseStringReference)(columnReference)),
         });
     },
+    value(value) {
+        return new raw_builder_js_1.RawBuilder({
+            queryId: (0, query_id_js_1.createQueryId)(),
+            rawNode: raw_node_js_1.RawNode.createWithChild((0, value_parser_js_1.parseValueExpression)(value)),
+        });
+    },
     table(tableReference) {
         return new raw_builder_js_1.RawBuilder({
             queryId: (0, query_id_js_1.createQueryId)(),