kysely 0.11.2 → 0.12.1

package/dist/esm/kysely.d.ts

@@ -10,14 +10,15 @@ import { DatabaseIntrospector } from './introspection/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 { LogLevel } from './util/log.js';
+import { LogConfig } from './util/log.js';
 /**
  * The main Kysely class.
  *
  * You should create one instance of `Kysely` per database using the {@link Kysely}
  * constructor. Each `Kysely` instance maintains it's own connection pool.
  *
- * @example
+ * ### Examples
+ *
  * This example assumes your database has tables `person` and `pet`:
  *
  * ```ts
@@ -31,7 +32,7 @@ import { LogLevel } from './util/log.js';
  *   id: number
  *   owner_id: number
  *   name: string
- *   species 'cat' | 'dog'
+ *   species 'cat' | 'dog'
  * }
  *
  * interface Database {
@@ -78,10 +79,11 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
      * A value to be used in place of columns that are generated in the database
      * when inserting rows.
      *
-     * @example
+     * ### Examples
+     *
      * In this example the `Person` table has non-null properties `id` and `created_at`
      * which are both automatically genereted by the database. Since their types are
-     * `number` and `string` respectively instead of `number | null` and `string | null`
+     * `number` and `string` respectively instead of `number | null` and `string | null`
      * the `values` method requires you to give a value for them. the `generated`
      * placeholder can be used in these cases.
      *
@@ -136,12 +138,13 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
      * transaction. If the function throws, the transaction is rolled back. Otherwise
      * the transaction is committed.
      *
-     * The callback function passed to the {@link TransactionBuilder.execute | execute}
+     * The callback function passed to the {@link TransactionBuilder.execute | execute}
      * method gets the transaction object as its only argument. The transaction is
      * of type {@link Transaction} which inherits {@link Kysely}. Any query
      * started through the transaction object is executed inside the transaction.
      *
-     * @example
+     * ### Examples
+     *
      * ```ts
      * const catto = await db.transaction().execute(async (trx) => {
      *   const jennifer = await trx.insertInto('person')
@@ -167,8 +170,7 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
      * })
      * ```
      *
-     * @example
-     * Setting the isolation level.
+     * Setting the isolation level:
      *
      * ```ts
      * await db
@@ -183,7 +185,8 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
     /**
      * Provides a kysely instance bound to a single database connection.
      *
-     * @example
+     * ### Examples
+     *
      * ```ts
      * await db
      *   .connection()
@@ -218,10 +221,15 @@ export declare class Kysely<DB> extends QueryCreator<DB> {
     get isTransaction(): boolean;
 }
 export declare class Transaction<DB> extends Kysely<DB> {
+    #private;
+    constructor(props: KyselyProps);
     get isTransaction(): true;
     get migration(): MigrationModule;
     transaction(): TransactionBuilder<DB>;
+    connection(): ConnectionBuilder<DB>;
     destroy(): Promise<void>;
+    withPlugin(plugin: KyselyPlugin): Transaction<DB>;
+    withoutPlugins(): Transaction<DB>;
 }
 export interface KyselyProps {
     readonly config: KyselyConfig;
@@ -235,17 +243,33 @@ export interface KyselyConfig {
     readonly dialect: Dialect;
     readonly plugins?: KyselyPlugin[];
     /**
-     * A list of log levels to log.
+     * A list of log levels to log or a custom logger function.
      *
      * Currently there's only two levels: `query` and `error`.
      * This will be expanded based on user feedback later.
      *
-     * Log levels:
+     * ### Examples
      *
-     *  - query: Log each query's SQL and duration using console.log
-     *  - error: Log all query errors using console.error
+     * ```ts
+     * const db = new Kysely<Database>({
+     *   dialect: new PostgresDialect(postgresConfig),
+     *   log: ['query', 'error']
+     * })
+     * ```
+     *
+     * ```ts
+     * const db = new Kysely<Database>({
+     *   dialect: new PostgresDialect(postgresConfig),
+     *   log(event): void {
+     *     if (event.level === 'query') {
+     *       console.log(event.query.sql)
+     *       console.log(event.query.parameters)
+     *     }
+     *   }
+     * })
+     * ```
      */
-    readonly log?: ReadonlyArray<LogLevel>;
+    readonly log?: LogConfig;
 }
 export declare class ConnectionBuilder<DB> {
     #private;

package/dist/esm/kysely.js

@@ -19,7 +19,8 @@ import { Log } from './util/log.js';
  * You should create one instance of `Kysely` per database using the {@link Kysely}
  * constructor. Each `Kysely` instance maintains it's own connection pool.
  *
- * @example
+ * ### Examples
+ *
  * This example assumes your database has tables `person` and `pet`:
  *
  * ```ts
@@ -33,7 +34,7 @@ import { Log } from './util/log.js';
  *   id: number
  *   owner_id: number
  *   name: string
- *   species 'cat' | 'dog'
+ *   species 'cat' | 'dog'
  * }
  *
  * interface Database {
@@ -111,10 +112,11 @@ export class Kysely extends QueryCreator {
      * A value to be used in place of columns that are generated in the database
      * when inserting rows.
      *
-     * @example
+     * ### Examples
+     *
      * In this example the `Person` table has non-null properties `id` and `created_at`
      * which are both automatically genereted by the database. Since their types are
-     * `number` and `string` respectively instead of `number | null` and `string | null`
+     * `number` and `string` respectively instead of `number | null` and `string | null`
      * the `values` method requires you to give a value for them. the `generated`
      * placeholder can be used in these cases.
      *
@@ -173,12 +175,13 @@ export class Kysely extends QueryCreator {
      * transaction. If the function throws, the transaction is rolled back. Otherwise
      * the transaction is committed.
      *
-     * The callback function passed to the {@link TransactionBuilder.execute | execute}
+     * The callback function passed to the {@link TransactionBuilder.execute | execute}
      * method gets the transaction object as its only argument. The transaction is
      * of type {@link Transaction} which inherits {@link Kysely}. Any query
      * started through the transaction object is executed inside the transaction.
      *
-     * @example
+     * ### Examples
+     *
      * ```ts
      * const catto = await db.transaction().execute(async (trx) => {
      *   const jennifer = await trx.insertInto('person')
@@ -204,8 +207,7 @@ export class Kysely extends QueryCreator {
      * })
      * ```
      *
-     * @example
-     * Setting the isolation level.
+     * Setting the isolation level:
      *
      * ```ts
      * await db
@@ -222,7 +224,8 @@ export class Kysely extends QueryCreator {
     /**
      * Provides a kysely instance bound to a single database connection.
      *
-     * @example
+     * ### Examples
+     *
      * ```ts
      * await db
      *   .connection()
@@ -273,6 +276,11 @@ export class Kysely extends QueryCreator {
     }
 }
 export class Transaction extends Kysely {
+    #props;
+    constructor(props) {
+        super(props);
+        this.#props = props;
+    }
     // The return type is `true` instead of `boolean` to make Kysely<DB>
     // unassignable to Transaction<DB> while allowing assignment the
     // other way around.
@@ -285,9 +293,24 @@ export class Transaction extends Kysely {
     transaction() {
         throw new Error('calling the transaction method for a Transaction is not supported');
     }
+    connection() {
+        throw new Error('calling the connection method for a Transaction is not supported');
+    }
     async destroy() {
         throw new Error('calling the destroy method for a Transaction is not supported');
     }
+    withPlugin(plugin) {
+        return new Transaction({
+            ...this.#props,
+            executor: this.#props.executor.withPlugin(plugin),
+        });
+    }
+    withoutPlugins() {
+        return new Transaction({
+            ...this.#props,
+            executor: this.#props.executor.withoutPlugins(),
+        });
+    }
 }
 export function isKyselyProps(obj) {
     return (isObject(obj) &&

package/dist/esm/migration/migration.d.ts

@@ -18,7 +18,8 @@ export declare class MigrationModule {
      * list of executed migrations doesn't match the list of possible migrations, and error
      * is thrown.
      *
-     * @example
+     * ### Examples
+     *
      * ```ts
      * await db.migration.migrateToLatest(
      *   path.join(__dirname, 'migrations')
@@ -30,7 +31,6 @@ export declare class MigrationModule {
      * the migrations is determined based on the alphabetical order of the keys in the record.
      * This can be useful if you are using a bundler like webpack or esbuild.
      *
-     * @example
      * ```ts
      * await db.migration.migrateToLatest({
      *   migration1: {

package/dist/esm/operation-node/create-table-node.d.ts

@@ -2,12 +2,16 @@ import { OperationNode } from './operation-node.js';
 import { TableNode } from './table-node.js';
 import { ConstraintNode } from './constraint-node.js';
 import { ColumnDefinitionNode } from './column-definition-node.js';
+export declare type OnCommitAction = 'preserve rows' | 'delete rows' | 'drop';
+export declare type CreateTableNodeParams = Omit<CreateTableNode, 'kind' | 'table' | 'columns' | 'constraints'>;
 export interface CreateTableNode extends OperationNode {
     readonly kind: 'CreateTableNode';
     readonly table: TableNode;
     readonly columns: ReadonlyArray<ColumnDefinitionNode>;
-    readonly ifNotExists?: boolean;
     readonly constraints?: ReadonlyArray<ConstraintNode>;
+    readonly temporary?: boolean;
+    readonly ifNotExists?: boolean;
+    readonly onCommit?: OnCommitAction;
 }
 /**
  * @internal
@@ -16,6 +20,6 @@ export declare const CreateTableNode: Readonly<{
     is(node: OperationNode): node is CreateTableNode;
     create(table: TableNode): CreateTableNode;
     cloneWithColumn(createTable: CreateTableNode, column: ColumnDefinitionNode): CreateTableNode;
-    cloneWithIfNotExists(createTable: CreateTableNode, ifNotExists: boolean): CreateTableNode;
     cloneWithConstraint(createTable: CreateTableNode, constraint: ConstraintNode): CreateTableNode;
+    cloneWith(createTable: CreateTableNode, params: CreateTableNodeParams): CreateTableNode;
 }>;

package/dist/esm/operation-node/create-table-node.js

@@ -19,12 +19,6 @@ export const CreateTableNode = freeze({
             columns: freeze([...createTable.columns, column]),
         });
     },
-    cloneWithIfNotExists(createTable, ifNotExists) {
-        return freeze({
-            ...createTable,
-            ifNotExists,
-        });
-    },
     cloneWithConstraint(createTable, constraint) {
         return freeze({
             ...createTable,
@@ -33,4 +27,10 @@ export const CreateTableNode = freeze({
                 : freeze([constraint]),
         });
     },
+    cloneWith(createTable, params) {
+        return freeze({
+            ...createTable,
+            ...params,
+        });
+    },
 });

package/dist/esm/operation-node/create-view-node.d.ts

@@ -7,6 +7,7 @@ export declare type CreateViewNodeParams = Omit<Partial<CreateViewNode>, 'kind'
 export interface CreateViewNode extends OperationNode {
     readonly kind: 'CreateViewNode';
     readonly name: IdentifierNode;
+    readonly temporary?: boolean;
     readonly materialized?: boolean;
     readonly orReplace?: boolean;
     readonly ifNotExists?: boolean;

package/dist/esm/operation-node/insert-query-node.d.ts

@@ -2,18 +2,18 @@ import { ColumnNode } from './column-node.js';
 import { OnConflictNode } from './on-conflict-node.js';
 import { OnDuplicateKeyNode } from './on-duplicate-key-node.js';
 import { OperationNode } from './operation-node.js';
-import { PrimitiveValueListNode } from './primitive-value-list-node.js';
+import { RawNode } from './raw-node.js';
 import { ReturningNode } from './returning-node.js';
+import { SelectQueryNode } from './select-query-node.js';
 import { TableNode } from './table-node.js';
-import { ValueListNode } from './value-list-node.js';
+import { ValuesNode } from './values-node.js';
 import { WithNode } from './with-node.js';
-export declare type InsertValuesNode = ValueListNode | PrimitiveValueListNode;
 export declare type InsertQueryNodeProps = Omit<InsertQueryNode, 'kind' | 'into'>;
 export interface InsertQueryNode extends OperationNode {
     readonly kind: 'InsertQueryNode';
     readonly into: TableNode;
     readonly columns?: ReadonlyArray<ColumnNode>;
-    readonly values?: ReadonlyArray<InsertValuesNode>;
+    readonly values?: ValuesNode | SelectQueryNode | RawNode;
     readonly returning?: ReturningNode;
     readonly onConflict?: OnConflictNode;
     readonly onDuplicateKey?: OnDuplicateKeyNode;

package/dist/esm/operation-node/operation-node-transformer.d.ts

@@ -63,6 +63,7 @@ import { DropViewNode } from './drop-view-node.js';
 import { GeneratedAlwaysAsNode } from './generated-always-as-node.js';
 import { DefaultValueNode } from './default-value-node.js';
 import { OnNode } from './on-node.js';
+import { ValuesNode } from './values-node.js';
 /**
  * Transforms an operation node tree into another one.
  *
@@ -113,6 +114,7 @@ export declare class OperationNodeTransformer {
     protected transformRaw(node: RawNode): RawNode;
     protected transformWhere(node: WhereNode): WhereNode;
     protected transformInsertQuery(node: InsertQueryNode): InsertQueryNode;
+    protected transformValues(node: ValuesNode): ValuesNode;
     protected transformDeleteQuery(node: DeleteQueryNode): DeleteQueryNode;
     protected transformReturning(node: ReturningNode): ReturningNode;
     protected transformCreateTable(node: CreateTableNode): CreateTableNode;

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

@@ -95,6 +95,7 @@ export class OperationNodeTransformer {
         GeneratedAlwaysAsNode: this.transformGeneratedAlwaysAs.bind(this),
         DefaultValueNode: this.transformDefaultValue.bind(this),
         OnNode: this.transformOn.bind(this),
+        ValuesNode: this.transformValues.bind(this),
     });
     transformNode = (node) => {
         if (!node) {
@@ -229,7 +230,7 @@ export class OperationNodeTransformer {
             kind: 'InsertQueryNode',
             into: this.transformNode(node.into),
             columns: this.transformNodeList(node.columns),
-            values: this.transformNodeList(node.values),
+            values: this.transformNode(node.values),
             returning: this.transformNode(node.returning),
             onConflict: this.transformNode(node.onConflict),
             onDuplicateKey: this.transformNode(node.onDuplicateKey),
@@ -237,6 +238,12 @@ export class OperationNodeTransformer {
             ignore: node.ignore,
         };
     }
+    transformValues(node) {
+        return {
+            kind: 'ValuesNode',
+            values: this.transformNodeList(node.values),
+        };
+    }
     transformDeleteQuery(node) {
         return {
             kind: 'DeleteQueryNode',
@@ -259,7 +266,9 @@ export class OperationNodeTransformer {
             table: this.transformNode(node.table),
             columns: this.transformNodeList(node.columns),
             constraints: this.transformNodeList(node.constraints),
+            temporary: node.temporary,
             ifNotExists: node.ifNotExists,
+            onCommit: node.onCommit,
         };
     }
     transformColumnDefinition(node) {
@@ -525,6 +534,7 @@ export class OperationNodeTransformer {
         return {
             kind: 'CreateViewNode',
             name: this.transformNode(node.name),
+            temporary: node.temporary,
             orReplace: node.orReplace,
             ifNotExists: node.ifNotExists,
             materialized: node.materialized,

package/dist/esm/operation-node/operation-node-visitor.d.ts

@@ -63,6 +63,7 @@ import { DropViewNode } from './drop-view-node.js';
 import { GeneratedAlwaysAsNode } from './generated-always-as-node.js';
 import { DefaultValueNode } from './default-value-node.js';
 import { OnNode } from './on-node.js';
+import { ValuesNode } from './values-node.js';
 export declare abstract class OperationNodeVisitor {
     #private;
     protected readonly nodeStack: OperationNode[];
@@ -132,4 +133,5 @@ export declare abstract class OperationNodeVisitor {
     protected abstract visitGeneratedAlwaysAs(node: GeneratedAlwaysAsNode): void;
     protected abstract visitDefaultValue(node: DefaultValueNode): void;
     protected abstract visitOn(node: OnNode): void;
+    protected abstract visitValues(node: ValuesNode): void;
 }

package/dist/esm/operation-node/operation-node-visitor.js

@@ -69,6 +69,7 @@ export class OperationNodeVisitor {
         GeneratedAlwaysAsNode: this.visitGeneratedAlwaysAs.bind(this),
         DefaultValueNode: this.visitDefaultValue.bind(this),
         OnNode: this.visitOn.bind(this),
+        ValuesNode: this.visitValues.bind(this),
     });
     visitNode = (node) => {
         this.nodeStack.push(node);

package/dist/esm/operation-node/operation-node.d.ts

@@ -1,4 +1,4 @@
-export declare type OperationNodeKind = 'IdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | 'FilterNode' | 'AndNode' | 'OrNode' | 'ParensNode' | 'ValueNode' | 'ValueListNode' | 'PrimitiveValueListNode' | 'JoinNode' | 'OperatorNode' | 'WhereNode' | 'InsertQueryNode' | 'DeleteQueryNode' | 'ReturningNode' | 'CreateTableNode' | 'ColumnDefinitionNode' | 'AddColumnNode' | 'DropTableNode' | 'DataTypeNode' | 'OrderByNode' | 'OrderByItemNode' | 'GroupByNode' | 'GroupByItemNode' | 'UpdateQueryNode' | 'ColumnUpdateNode' | 'LimitNode' | 'OffsetNode' | 'OnConflictNode' | 'OnDuplicateKeyNode' | 'CreateIndexNode' | 'DropIndexNode' | 'ListNode' | 'ReferencesNode' | 'PrimaryKeyConstraintNode' | 'UniqueConstraintNode' | 'CheckConstraintNode' | 'ForeignKeyConstraintNode' | 'WithNode' | 'CommonTableExpressionNode' | 'HavingNode' | 'CreateSchemaNode' | 'DropSchemaNode' | 'AlterTableNode' | 'ModifyColumnNode' | 'DropColumnNode' | 'RenameColumnNode' | 'AlterColumnNode' | 'AddConstraintNode' | 'DropConstraintNode' | 'UnionNode' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedAlwaysAsNode' | 'DefaultValueNode' | 'OnNode';
+export declare type OperationNodeKind = 'IdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | 'FilterNode' | 'AndNode' | 'OrNode' | 'ParensNode' | 'ValueNode' | 'ValueListNode' | 'PrimitiveValueListNode' | 'JoinNode' | 'OperatorNode' | 'WhereNode' | 'InsertQueryNode' | 'DeleteQueryNode' | 'ReturningNode' | 'CreateTableNode' | 'ColumnDefinitionNode' | 'AddColumnNode' | 'DropTableNode' | 'DataTypeNode' | 'OrderByNode' | 'OrderByItemNode' | 'GroupByNode' | 'GroupByItemNode' | 'UpdateQueryNode' | 'ColumnUpdateNode' | 'LimitNode' | 'OffsetNode' | 'OnConflictNode' | 'OnDuplicateKeyNode' | 'CreateIndexNode' | 'DropIndexNode' | 'ListNode' | 'ReferencesNode' | 'PrimaryKeyConstraintNode' | 'UniqueConstraintNode' | 'CheckConstraintNode' | 'ForeignKeyConstraintNode' | 'WithNode' | 'CommonTableExpressionNode' | 'HavingNode' | 'CreateSchemaNode' | 'DropSchemaNode' | 'AlterTableNode' | 'ModifyColumnNode' | 'DropColumnNode' | 'RenameColumnNode' | 'AlterColumnNode' | 'AddConstraintNode' | 'DropConstraintNode' | 'UnionNode' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedAlwaysAsNode' | 'DefaultValueNode' | 'OnNode' | 'ValuesNode';
 export interface OperationNode {
     readonly kind: OperationNodeKind;
 }

package/dist/esm/operation-node/query-node.d.ts

@@ -14,8 +14,6 @@ export declare type FilterableQueryNode = SelectQueryNode | DeleteQueryNode | Up
  */
 export declare const QueryNode: Readonly<{
     is(node: OperationNode): node is QueryNode;
-    isMutating(node: OperationNode): node is MutatingQueryNode;
-    isFilterable(node: OperationNode): node is FilterableQueryNode;
     cloneWithWhere<T extends FilterableQueryNode>(node: T, filter: FilterExpressionNode): T;
     cloneWithOrWhere<T_1 extends FilterableQueryNode>(node: T_1, filter: FilterExpressionNode): T_1;
     cloneWithJoin<T_2 extends FilterableQueryNode>(node: T_2, join: JoinNode): T_2;

package/dist/esm/operation-node/query-node.js

@@ -15,16 +15,6 @@ export const QueryNode = freeze({
             UpdateQueryNode.is(node) ||
             SelectQueryNode.is(node));
     },
-    isMutating(node) {
-        return (DeleteQueryNode.is(node) ||
-            InsertQueryNode.is(node) ||
-            UpdateQueryNode.is(node));
-    },
-    isFilterable(node) {
-        return (SelectQueryNode.is(node) ||
-            DeleteQueryNode.is(node) ||
-            UpdateQueryNode.is(node));
-    },
     cloneWithWhere(node, filter) {
         return freeze({
             ...node,

package/dist/esm/operation-node/values-node.d.ts

@@ -0,0 +1,15 @@
+import { OperationNode } from './operation-node.js';
+import { PrimitiveValueListNode } from './primitive-value-list-node.js';
+import { ValueListNode } from './value-list-node.js';
+export declare type ValuesItemNode = ValueListNode | PrimitiveValueListNode;
+export interface ValuesNode extends OperationNode {
+    readonly kind: 'ValuesNode';
+    readonly values: ReadonlyArray<ValuesItemNode>;
+}
+/**
+ * @internal
+ */
+export declare const ValuesNode: Readonly<{
+    is(node: OperationNode): node is ValuesNode;
+    create(values: ReadonlyArray<ValuesItemNode>): ValuesNode;
+}>;

package/dist/esm/operation-node/values-node.js

@@ -0,0 +1,15 @@
+import { freeze } from '../util/object-utils.js';
+/**
+ * @internal
+ */
+export const ValuesNode = freeze({
+    is(node) {
+        return node.kind === 'ValuesNode';
+    },
+    create(values) {
+        return freeze({
+            kind: 'ValuesNode',
+            values: freeze(values),
+        });
+    },
+});

package/dist/esm/package.json

@@ -1,3 +1 @@
-{
-    "type": "module"
-}
+{"type":"module"}

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

@@ -0,0 +1,9 @@
+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>;
+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;

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

@@ -0,0 +1,20 @@
+import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
+import { isFunction } from '../util/object-utils.js';
+export function parseComplexExpression(ctx, exp) {
+    if (isOperationNodeSource(exp)) {
+        return exp.toOperationNode();
+    }
+    else if (isFunction(exp)) {
+        return exp(ctx.createExpressionBuilder()).toOperationNode();
+    }
+    throw new Error(`invalid expression: ${JSON.stringify(exp)}`);
+}
+export function parseAliasedComplexExpression(ctx, exp) {
+    if (isOperationNodeSource(exp)) {
+        return exp.toOperationNode();
+    }
+    else if (isFunction(exp)) {
+        return exp(ctx.createExpressionBuilder()).toOperationNode();
+    }
+    throw new Error(`invalid aliased expression: ${JSON.stringify(exp)}`);
+}

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

@@ -1,15 +1,24 @@
 import { FilterNode } from '../operation-node/filter-node.js';
-import { AnyQueryBuilder, AnyRawBuilder, QueryBuilderFactory, RawBuilderFactory } from '../util/type-utils.js';
+import { AnyRawBuilder } from '../util/type-utils.js';
 import { Operator } from '../operation-node/operator-node.js';
-import { ReferenceExpression } from './reference-parser.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';
-export declare type ExistsExpression<DB, TB extends keyof DB> = AnyQueryBuilder | QueryBuilderFactory<DB, TB> | AnyRawBuilder | RawBuilderFactory<DB, TB>;
+import { WhereInterface } from '../query-builder/where-interface.js';
+import { HavingInterface } from '../query-builder/having-interface.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 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: 'where' | 'having' | 'on', args: any[]): FilterExpressionNode;
+export declare function parseFilter(ctx: ParseContext, type: FilterType, args: any[]): FilterExpressionNode;
+export {};

package/dist/esm/parser/filter-parser.js

@@ -6,7 +6,6 @@ import { OperatorNode, OPERATORS, } from '../operation-node/operator-node.js';
 import { ParensNode } from '../operation-node/parens-node.js';
 import { parseReferenceExpression, } from './reference-parser.js';
 import { parseValueExpressionOrList, } from './value-parser.js';
-import { SelectQueryNode } from '../operation-node/select-query-node.js';
 import { ValueNode } from '../operation-node/value-node.js';
 export function parseWhereFilter(ctx, args) {
     return parseFilter(ctx, 'where', args);
@@ -31,18 +30,9 @@ export function parseFilter(ctx, type, args) {
         return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
     }
     else if (args.length === 1) {
-        const arg = args[0];
-        if (isFunction(arg)) {
-            return GROUP_PARSERS[type](ctx, arg);
-        }
-        else if (isOperationNodeSource(arg)) {
-            const node = arg.toOperationNode();
-            if (RawNode.is(node)) {
-                return node;
-            }
-        }
+        return parseOneArgFilter(ctx, type, args[0]);
     }
-    throw new Error(`invalid arguments passed to a '${type}' method: ${JSON.stringify(args)}`);
+    throw createFilterError(type, args);
 }
 function parseThreeArgFilter(ctx, left, op, right) {
     if ((op === 'is' || op === 'is not') && (isNull(right) || isBoolean(right))) {
@@ -54,10 +44,8 @@ function parseIsFilter(ctx, left, op, right) {
     return FilterNode.create(parseReferenceExpression(ctx, left), parseFilterOperator(op), ValueNode.createImmediate(right));
 }
 function parseFilterOperator(op) {
-    if (isString(op)) {
-        if (OPERATORS.includes(op)) {
-            return OperatorNode.create(op);
-        }
+    if (isString(op) && OPERATORS.includes(op)) {
+        return OperatorNode.create(op);
     }
     else if (isOperationNodeSource(op)) {
         return op.toOperationNode();
@@ -65,17 +53,26 @@ function parseFilterOperator(op) {
     throw new Error(`invalid comparison operator ${JSON.stringify(op)} passed to a filter method`);
 }
 function parseExistExpression(ctx, type, arg) {
-    const node = isFunction(arg)
-        ? arg(ctx.createExpressionBuilder()).toOperationNode()
-        : arg.toOperationNode();
-    if (!SelectQueryNode.is(node) && !RawNode.is(node)) {
-        throw new Error('invalid where exists arg');
+    return FilterNode.create(undefined, OperatorNode.create(type), parseValueExpressionOrList(ctx, arg));
+}
+function parseOneArgFilter(ctx, type, arg) {
+    if (isFunction(arg)) {
+        return GROUP_PARSERS[type](ctx, arg);
     }
-    return FilterNode.create(undefined, OperatorNode.create(type), node);
+    else if (isOperationNodeSource(arg)) {
+        const node = arg.toOperationNode();
+        if (RawNode.is(node)) {
+            return node;
+        }
+    }
+    throw createFilterError(type, arg);
+}
+function createFilterError(type, args) {
+    return new Error(`invalid arguments passed to a '${type}' method: ${JSON.stringify(args)}`);
 }
 const GROUP_PARSERS = freeze({
     where(ctx, callback) {
-        const query = callback(ctx.createSelectQueryBuilder([]));
+        const query = callback(ctx.createSelectQueryBuilder());
         const queryNode = query.toOperationNode();
         if (!queryNode.where) {
             throw new Error('no `where` methods called insided a group callback');
@@ -83,7 +80,7 @@ const GROUP_PARSERS = freeze({
         return ParensNode.create(queryNode.where.where);
     },
     having(ctx, callback) {
-        const query = callback(ctx.createSelectQueryBuilder([]));
+        const query = callback(ctx.createSelectQueryBuilder());
         const queryNode = query.toOperationNode();
         if (!queryNode.having) {
             throw new Error('no `having` methods called insided a group callback');