kysely 0.25.0 → 0.26.0

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

@@ -114,6 +114,10 @@ export class OperationNodeTransformer {
         FunctionNode: this.transformFunction.bind(this),
         CaseNode: this.transformCase.bind(this),
         WhenNode: this.transformWhen.bind(this),
+        JSONReferenceNode: this.transformJSONReference.bind(this),
+        JSONPathNode: this.transformJSONPath.bind(this),
+        JSONPathLegNode: this.transformJSONPathLeg.bind(this),
+        JSONOperatorChainNode: this.transformJSONOperatorChain.bind(this),
     });
     transformNode(node) {
         if (!node) {
@@ -187,8 +191,8 @@ export class OperationNodeTransformer {
     transformReference(node) {
         return requireAllProps({
             kind: 'ReferenceNode',
-            table: this.transformNode(node.table),
             column: this.transformNode(node.column),
+            table: this.transformNode(node.table),
         });
     }
     transformAnd(node) {
@@ -723,6 +727,34 @@ export class OperationNodeTransformer {
             result: this.transformNode(node.result),
         });
     }
+    transformJSONReference(node) {
+        return requireAllProps({
+            kind: 'JSONReferenceNode',
+            reference: this.transformNode(node.reference),
+            traversal: this.transformNode(node.traversal),
+        });
+    }
+    transformJSONPath(node) {
+        return requireAllProps({
+            kind: 'JSONPathNode',
+            inOperator: this.transformNode(node.inOperator),
+            pathLegs: this.transformNodeList(node.pathLegs),
+        });
+    }
+    transformJSONPathLeg(node) {
+        return requireAllProps({
+            kind: 'JSONPathLegNode',
+            type: node.type,
+            value: node.value,
+        });
+    }
+    transformJSONOperatorChain(node) {
+        return requireAllProps({
+            kind: 'JSONOperatorChainNode',
+            operator: this.transformNode(node.operator),
+            values: this.transformNodeList(node.values),
+        });
+    }
     transformDataType(node) {
         // An Object.freezed leaf node. No need to clone.
         return node;

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

@@ -80,6 +80,10 @@ import { UsingNode } from './using-node.js';
 import { FunctionNode } from './function-node.js';
 import { WhenNode } from './when-node.js';
 import { CaseNode } from './case-node.js';
+import { JSONReferenceNode } from './json-reference-node.js';
+import { JSONPathNode } from './json-path-node.js';
+import { JSONPathLegNode } from './json-path-leg-node.js';
+import { JSONOperatorChainNode } from './json-operator-chain-node.js';
 export declare abstract class OperationNodeVisitor {
     #private;
     protected readonly nodeStack: OperationNode[];
@@ -166,4 +170,8 @@ export declare abstract class OperationNodeVisitor {
     protected abstract visitFunction(node: FunctionNode): void;
     protected abstract visitCase(node: CaseNode): void;
     protected abstract visitWhen(node: WhenNode): void;
+    protected abstract visitJSONReference(node: JSONReferenceNode): void;
+    protected abstract visitJSONPath(node: JSONPathNode): void;
+    protected abstract visitJSONPathLeg(node: JSONPathLegNode): void;
+    protected abstract visitJSONOperatorChain(node: JSONOperatorChainNode): void;
 }

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

@@ -87,6 +87,10 @@ export class OperationNodeVisitor {
         FunctionNode: this.visitFunction.bind(this),
         CaseNode: this.visitCase.bind(this),
         WhenNode: this.visitWhen.bind(this),
+        JSONReferenceNode: this.visitJSONReference.bind(this),
+        JSONPathNode: this.visitJSONPath.bind(this),
+        JSONPathLegNode: this.visitJSONPathLeg.bind(this),
+        JSONOperatorChainNode: this.visitJSONOperatorChain.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' | 'SchemableIdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | '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' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedNode' | 'DefaultValueNode' | 'OnNode' | 'ValuesNode' | 'CommonTableExpressionNameNode' | 'SelectModifierNode' | 'CreateTypeNode' | 'DropTypeNode' | 'ExplainNode' | 'DefaultInsertValueNode' | 'AggregateFunctionNode' | 'OverNode' | 'PartitionByNode' | 'PartitionByItemNode' | 'SetOperationNode' | 'BinaryOperationNode' | 'UnaryOperationNode' | 'UsingNode' | 'FunctionNode' | 'CaseNode' | 'WhenNode';
+export type OperationNodeKind = 'IdentifierNode' | 'SchemableIdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | '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' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedNode' | 'DefaultValueNode' | 'OnNode' | 'ValuesNode' | 'CommonTableExpressionNameNode' | 'SelectModifierNode' | 'CreateTypeNode' | 'DropTypeNode' | 'ExplainNode' | 'DefaultInsertValueNode' | 'AggregateFunctionNode' | 'OverNode' | 'PartitionByNode' | 'PartitionByItemNode' | 'SetOperationNode' | 'BinaryOperationNode' | 'UnaryOperationNode' | 'UsingNode' | 'FunctionNode' | 'CaseNode' | 'WhenNode' | 'JSONReferenceNode' | 'JSONPathNode' | 'JSONPathLegNode' | 'JSONOperatorChainNode';
 export interface OperationNode {
     readonly kind: OperationNodeKind;
 }

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

@@ -1,16 +1,19 @@
 import { OperationNode } from './operation-node.js';
-export declare const COMPARISON_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->"];
+export declare const COMPARISON_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "regexp"];
 export declare const ARITHMETIC_OPERATORS: readonly ["+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>"];
-export declare const BINARY_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>", "&&", "||"];
+export declare const JSON_OPERATORS: readonly ["->", "->>"];
+export declare const BINARY_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "regexp", "+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>", "&&", "||"];
 export declare const UNARY_FILTER_OPERATORS: readonly ["exists", "not exists"];
 export declare const UNARY_OPERATORS: readonly ["not", "-", "exists", "not exists"];
-export declare const OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>", "&&", "||", "not", "-", "exists", "not exists"];
-export declare type ComparisonOperator = typeof COMPARISON_OPERATORS[number];
-export declare type ArithmeticOperator = typeof ARITHMETIC_OPERATORS[number];
-export declare type BinaryOperator = typeof BINARY_OPERATORS[number];
-export declare type UnaryOperator = typeof UNARY_OPERATORS[number];
-export declare type UnaryFilterOperator = typeof UNARY_FILTER_OPERATORS[number];
-export declare type Operator = typeof OPERATORS[number];
+export declare const OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "regexp", "+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>", "&&", "||", "->", "->>", "not", "-", "exists", "not exists"];
+export type ComparisonOperator = (typeof COMPARISON_OPERATORS)[number];
+export type ArithmeticOperator = (typeof ARITHMETIC_OPERATORS)[number];
+export type JSONOperator = (typeof JSON_OPERATORS)[number];
+export type JSONOperatorWith$ = JSONOperator | `${JSONOperator}$`;
+export type BinaryOperator = (typeof BINARY_OPERATORS)[number];
+export type UnaryOperator = (typeof UNARY_OPERATORS)[number];
+export type UnaryFilterOperator = (typeof UNARY_FILTER_OPERATORS)[number];
+export type Operator = (typeof OPERATORS)[number];
 export interface OperatorNode extends OperationNode {
     readonly kind: 'OperatorNode';
     readonly operator: Operator;
@@ -26,3 +29,4 @@ export declare function isOperator(op: unknown): op is Operator;
 export declare function isBinaryOperator(op: unknown): op is BinaryOperator;
 export declare function isComparisonOperator(op: unknown): op is ComparisonOperator;
 export declare function isArithmeticOperator(op: unknown): op is ArithmeticOperator;
+export declare function isJSONOperator(op: unknown): op is JSONOperator;

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

@@ -33,6 +33,7 @@ export const COMPARISON_OPERATORS = [
     '@@@',
     '!!',
     '<->',
+    'regexp',
 ];
 export const ARITHMETIC_OPERATORS = [
     '+',
@@ -47,6 +48,7 @@ export const ARITHMETIC_OPERATORS = [
     '<<',
     '>>',
 ];
+export const JSON_OPERATORS = ['->', '->>'];
 export const BINARY_OPERATORS = [
     ...COMPARISON_OPERATORS,
     ...ARITHMETIC_OPERATORS,
@@ -55,7 +57,11 @@ export const BINARY_OPERATORS = [
 ];
 export const UNARY_FILTER_OPERATORS = ['exists', 'not exists'];
 export const UNARY_OPERATORS = ['not', '-', ...UNARY_FILTER_OPERATORS];
-export const OPERATORS = [...BINARY_OPERATORS, ...UNARY_OPERATORS];
+export const OPERATORS = [
+    ...BINARY_OPERATORS,
+    ...JSON_OPERATORS,
+    ...UNARY_OPERATORS,
+];
 /**
  * @internal
  */
@@ -82,3 +88,6 @@ export function isComparisonOperator(op) {
 export function isArithmeticOperator(op) {
     return isString(op) && ARITHMETIC_OPERATORS.includes(op);
 }
+export function isJSONOperator(op) {
+    return isString(op) && JSON_OPERATORS.includes(op);
+}

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

@@ -10,17 +10,17 @@ import { OperationNode } from './operation-node.js';
 import { ExplainNode } from './explain-node.js';
 import { ExplainFormat } from '../util/explainable.js';
 import { Expression } from '../expression/expression.js';
-export declare type QueryNode = SelectQueryNode | InsertQueryNode | UpdateQueryNode | DeleteQueryNode;
-declare type HasJoins = {
+export type QueryNode = SelectQueryNode | InsertQueryNode | UpdateQueryNode | DeleteQueryNode;
+type HasJoins = {
     joins?: ReadonlyArray<JoinNode>;
 };
-declare type HasWhere = {
+type HasWhere = {
     where?: WhereNode;
 };
-declare type HasReturning = {
+type HasReturning = {
     returning?: ReturningNode;
 };
-declare type HasExplain = {
+type HasExplain = {
     explain?: ExplainNode;
 };
 /**
@@ -29,10 +29,9 @@ declare type HasExplain = {
 export declare const QueryNode: Readonly<{
     is(node: OperationNode): node is QueryNode;
     cloneWithWhere<T extends HasWhere>(node: T, operation: OperationNode): T;
-    cloneWithOrWhere<T_1 extends HasWhere>(node: T_1, operation: OperationNode): T_1;
-    cloneWithJoin<T_2 extends HasJoins>(node: T_2, join: JoinNode): T_2;
-    cloneWithReturning<T_3 extends HasReturning>(node: T_3, selections: ReadonlyArray<SelectionNode>): T_3;
-    cloneWithoutWhere<T_4 extends HasWhere>(node: T_4): T_4;
-    cloneWithExplain<T_5 extends HasExplain>(node: T_5, format: ExplainFormat | undefined, options: Expression<any> | undefined): T_5;
+    cloneWithJoin<T_1 extends HasJoins>(node: T_1, join: JoinNode): T_1;
+    cloneWithReturning<T_2 extends HasReturning>(node: T_2, selections: ReadonlyArray<SelectionNode>): T_2;
+    cloneWithoutWhere<T_3 extends HasWhere>(node: T_3): T_3;
+    cloneWithExplain<T_4 extends HasExplain>(node: T_4, format: ExplainFormat | undefined, options: Expression<any> | undefined): T_4;
 }>;
 export {};

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

@@ -25,14 +25,6 @@ export const QueryNode = freeze({
                 : WhereNode.create(operation),
         });
     },
-    cloneWithOrWhere(node, operation) {
-        return freeze({
-            ...node,
-            where: node.where
-                ? WhereNode.cloneWithOperation(node.where, 'Or', operation)
-                : WhereNode.create(operation),
-        });
-    },
     cloneWithJoin(node, join) {
         return freeze({
             ...node,

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

@@ -4,14 +4,14 @@ import { TableNode } from './table-node.js';
 import { SelectAllNode } from './select-all-node.js';
 export interface ReferenceNode extends OperationNode {
     readonly kind: 'ReferenceNode';
-    readonly table: TableNode;
     readonly column: ColumnNode | SelectAllNode;
+    readonly table?: TableNode;
 }
 /**
  * @internal
  */
 export declare const ReferenceNode: Readonly<{
     is(node: OperationNode): node is ReferenceNode;
-    create(table: TableNode, column: ColumnNode): ReferenceNode;
+    create(column: ColumnNode, table?: TableNode): ReferenceNode;
     createSelectAll(table: TableNode): ReferenceNode;
 }>;

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

@@ -8,7 +8,7 @@ export const ReferenceNode = freeze({
     is(node) {
         return node.kind === 'ReferenceNode';
     },
-    create(table, column) {
+    create(column, table) {
         return freeze({
             kind: 'ReferenceNode',
             table,

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

@@ -3,7 +3,7 @@ import { ColumnNode } from './column-node.js';
 import { TableNode } from './table-node.js';
 import { ArrayItemType } from '../util/type-utils.js';
 export declare const ON_MODIFY_FOREIGN_ACTIONS: readonly ["no action", "restrict", "cascade", "set null", "set default"];
-export declare type OnModifyForeignAction = ArrayItemType<typeof ON_MODIFY_FOREIGN_ACTIONS>;
+export type OnModifyForeignAction = ArrayItemType<typeof ON_MODIFY_FOREIGN_ACTIONS>;
 export interface ReferencesNode extends OperationNode {
     readonly kind: 'ReferencesNode';
     readonly table: TableNode;

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

@@ -1,5 +1,5 @@
 import { OperationNode } from './operation-node.js';
-export declare type SelectModifier = 'ForUpdate' | 'ForNoKeyUpdate' | 'ForShare' | 'ForKeyShare' | 'NoWait' | 'SkipLocked' | 'Distinct';
+export type SelectModifier = 'ForUpdate' | 'ForNoKeyUpdate' | 'ForShare' | 'ForKeyShare' | 'NoWait' | 'SkipLocked' | 'Distinct';
 export interface SelectModifierNode extends OperationNode {
     readonly kind: 'SelectModifierNode';
     readonly modifier?: SelectModifier;

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

@@ -47,7 +47,6 @@ export declare const SelectQueryNode: Readonly<{
     cloneWithLimit(selectNode: SelectQueryNode, limit: LimitNode): SelectQueryNode;
     cloneWithOffset(selectNode: SelectQueryNode, offset: OffsetNode): SelectQueryNode;
     cloneWithHaving(selectNode: SelectQueryNode, operation: OperationNode): SelectQueryNode;
-    cloneWithOrHaving(selectNode: SelectQueryNode, operation: OperationNode): SelectQueryNode;
     cloneWithSetOperation(selectNode: SelectQueryNode, setOperation: SetOperationNode): SelectQueryNode;
     cloneWithoutSelections(select: SelectQueryNode): SelectQueryNode;
     cloneWithoutLimit(select: SelectQueryNode): SelectQueryNode;

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

@@ -86,14 +86,6 @@ export const SelectQueryNode = freeze({
                 : HavingNode.create(operation),
         });
     },
-    cloneWithOrHaving(selectNode, operation) {
-        return freeze({
-            ...selectNode,
-            having: selectNode.having
-                ? HavingNode.cloneWithOperation(selectNode.having, 'Or', operation)
-                : HavingNode.create(operation),
-        });
-    },
     cloneWithSetOperation(selectNode, setOperation) {
         return freeze({
             ...selectNode,

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

@@ -3,7 +3,7 @@ import { OperationNode } from './operation-node.js';
 import { SelectAllNode } from './select-all-node.js';
 import { SimpleReferenceExpressionNode } from './simple-reference-expression-node.js';
 import { TableNode } from './table-node.js';
-declare type SelectionNodeChild = SimpleReferenceExpressionNode | AliasNode | SelectAllNode;
+type SelectionNodeChild = SimpleReferenceExpressionNode | AliasNode | SelectAllNode;
 export interface SelectionNode extends OperationNode {
     readonly kind: 'SelectionNode';
     readonly selection: SelectionNodeChild;

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

@@ -1,5 +1,5 @@
 import { OperationNode } from './operation-node.js';
-export declare type SetOperator = 'union' | 'intersect' | 'except';
+export type SetOperator = 'union' | 'intersect' | 'except';
 export interface SetOperationNode extends OperationNode {
     kind: 'SetOperationNode';
     operator: SetOperator;

package/dist/esm/operation-node/simple-reference-expression-node.d.ts

@@ -1,3 +1,3 @@
 import { ColumnNode } from './column-node.js';
 import { ReferenceNode } from './reference-node.js';
-export declare type SimpleReferenceExpressionNode = ColumnNode | ReferenceNode;
+export type SimpleReferenceExpressionNode = ColumnNode | ReferenceNode;

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

@@ -8,7 +8,7 @@ import { WhereNode } from './where-node.js';
 import { WithNode } from './with-node.js';
 import { FromNode } from './from-node.js';
 import { ExplainNode } from './explain-node.js';
-export declare type UpdateValuesNode = ValueListNode | PrimitiveValueListNode;
+export type UpdateValuesNode = ValueListNode | PrimitiveValueListNode;
 export interface UpdateQueryNode extends OperationNode {
     readonly kind: 'UpdateQueryNode';
     readonly table: OperationNode;

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

@@ -1,7 +1,7 @@
 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 type ValuesItemNode = ValueListNode | PrimitiveValueListNode;
 export interface ValuesNode extends OperationNode {
     readonly kind: 'ValuesNode';
     readonly values: ReadonlyArray<ValuesItemNode>;

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

@@ -1,6 +1,6 @@
 import { OperationNode } from './operation-node.js';
 import { CommonTableExpressionNode } from './common-table-expression-node.js';
-export declare type WithNodeParams = Omit<WithNode, 'kind' | 'expressions'>;
+export type WithNodeParams = Omit<WithNode, 'kind' | 'expressions'>;
 export interface WithNode extends OperationNode {
     readonly kind: 'WithNode';
     readonly expressions: ReadonlyArray<CommonTableExpressionNode>;

package/dist/esm/parser/binary-operation-parser.d.ts

@@ -4,17 +4,14 @@ import { ExtractTypeFromReferenceExpression, ReferenceExpression } from './refer
 import { ValueExpression, ValueExpressionOrList } from './value-parser.js';
 import { OperationNode } from '../operation-node/operation-node.js';
 import { Expression } from '../expression/expression.js';
-export declare type OperandValueExpression<DB, TB extends keyof DB, RE> = ValueExpression<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
-export declare type OperandValueExpressionOrList<DB, TB extends keyof DB, RE> = ValueExpressionOrList<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE> | null>;
-export declare type OperatorExpression = Operator | Expression<unknown>;
-export declare type BinaryOperatorExpression = BinaryOperator | Expression<unknown>;
-export declare type ComparisonOperatorExpression = ComparisonOperator | Expression<unknown>;
-export declare type ArithmeticOperatorExpression = ArithmeticOperator | Expression<unknown>;
+export type OperandValueExpression<DB, TB extends keyof DB, RE> = ValueExpression<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
+export type OperandValueExpressionOrList<DB, TB extends keyof DB, RE> = ValueExpressionOrList<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE> | null>;
+export type OperatorExpression = Operator | Expression<unknown>;
+export type BinaryOperatorExpression = BinaryOperator | Expression<unknown>;
+export type ComparisonOperatorExpression = ComparisonOperator | Expression<unknown>;
+export type ArithmeticOperatorExpression = ArithmeticOperator | Expression<unknown>;
+export declare function parseFilter(args: any[]): OperationNode;
+export declare function parseValueBinaryOperationOrExpression(args: any[]): OperationNode;
 export declare function parseValueBinaryOperation(leftOperand: ReferenceExpression<any, any>, operator: BinaryOperatorExpression, rightOperand: OperandValueExpressionOrList<any, any, any>): BinaryOperationNode;
-export declare function parseReferentialBinaryOperation(leftOperand: ReferenceExpression<any, any>, operator: BinaryOperatorExpression, rightOperand: OperandValueExpressionOrList<any, any, any>): BinaryOperationNode;
-export declare function parseValueComparison(leftOperand: ReferenceExpression<any, any>, operator: ComparisonOperatorExpression, rightOperand: OperandValueExpressionOrList<any, any, any>): BinaryOperationNode;
 export declare function parseReferentialComparison(leftOperand: ReferenceExpression<any, any>, operator: ComparisonOperatorExpression, rightOperand: ReferenceExpression<any, any>): BinaryOperationNode;
-export declare function parseWhere(args: any[]): OperationNode;
-export declare function parseHaving(args: any[]): OperationNode;
-export declare function parseOn(args: any[]): OperationNode;
-export declare function parseWhen(args: any[]): OperationNode;
+export declare function parseReferentialBinaryOperation(leftOperand: ReferenceExpression<any, any>, operator: BinaryOperatorExpression, rightOperand: OperandValueExpressionOrList<any, any, any>): BinaryOperationNode;

package/dist/esm/parser/binary-operation-parser.js

@@ -1,70 +1,60 @@
 /// <reference types="./binary-operation-parser.d.ts" />
 import { BinaryOperationNode } from '../operation-node/binary-operation-node.js';
-import { freeze, isBoolean, isFunction, isNull, isString, } from '../util/object-utils.js';
+import { isBoolean, isFunction, isNull, isString, } from '../util/object-utils.js';
 import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
-import { RawNode } from '../operation-node/raw-node.js';
 import { OperatorNode, isComparisonOperator, isBinaryOperator, 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 { ValueNode } from '../operation-node/value-node.js';
-import { createJoinBuilder, createSelectQueryBuilder } from './parse-utils.js';
-import { SelectQueryNode } from '../operation-node/select-query-node.js';
-import { JoinNode } from '../operation-node/join-node.js';
-import { expressionBuilder } from '../expression/expression-builder.js';
-import { UnaryOperationNode } from '../operation-node/unary-operation-node.js';
-import { CaseNode } from '../operation-node/case-node.js';
-export function parseValueBinaryOperation(leftOperand, operator, rightOperand) {
-    if (!isBinaryOperator(operator) && !isOperationNodeSource(operator)) {
-        throw new Error(`invalid binary operator ${JSON.stringify(operator)}`);
+import { isExpression } from '../expression/expression.js';
+import { createExpressionBuilder } from '../expression/expression-builder.js';
+export function parseFilter(args) {
+    if (args.length > 1 && !isComparisonOperatorExpression(args[1])) {
+        throw new Error(`invalid comparison operator ${JSON.stringify(args[1])}`);
     }
-    if (isIsComparison(operator, rightOperand)) {
-        return parseIs(leftOperand, operator, rightOperand);
+    return parseValueBinaryOperationOrExpression(args);
+}
+export function parseValueBinaryOperationOrExpression(args) {
+    if (args.length === 3) {
+        return parseValueBinaryOperation(args[0], args[1], args[2]);
     }
-    return BinaryOperationNode.create(parseReferenceExpression(leftOperand), parseOperator(operator), parseValueExpressionOrList(rightOperand));
+    else if (args.length === 1) {
+        return parseExpressionOrFactory(args[0]);
+    }
+    throw new Error(`invalid arguments: ${JSON.stringify(args)}`);
 }
-export function parseReferentialBinaryOperation(leftOperand, operator, rightOperand) {
-    if (!isBinaryOperator(operator) && !isOperationNodeSource(operator)) {
+export function parseValueBinaryOperation(leftOperand, operator, rightOperand) {
+    if (!isBinaryOperatorExpression(operator)) {
         throw new Error(`invalid binary operator ${JSON.stringify(operator)}`);
     }
-    return BinaryOperationNode.create(parseReferenceExpression(leftOperand), parseOperator(operator), parseReferenceExpression(rightOperand));
-}
-export function parseValueComparison(leftOperand, operator, rightOperand) {
-    if (!isComparisonOperator(operator) && !isOperationNodeSource(operator)) {
-        throw new Error(`invalid comparison operator ${JSON.stringify(operator)}`);
+    if (isIsOperator(operator) && isNullOrBoolean(rightOperand)) {
+        return parseIs(leftOperand, operator, rightOperand);
     }
-    return parseValueBinaryOperation(leftOperand, operator, rightOperand);
+    return BinaryOperationNode.create(parseReferenceExpression(leftOperand), parseOperator(operator), parseValueExpressionOrList(rightOperand));
 }
 export function parseReferentialComparison(leftOperand, operator, rightOperand) {
-    if (!isComparisonOperator(operator) && !isOperationNodeSource(operator)) {
+    if (!isComparisonOperatorExpression(operator)) {
         throw new Error(`invalid comparison operator ${JSON.stringify(operator)}`);
     }
     return parseReferentialBinaryOperation(leftOperand, operator, rightOperand);
 }
-export function parseWhere(args) {
-    return parseFilter('where', args);
-}
-export function parseHaving(args) {
-    return parseFilter('having', args);
+export function parseReferentialBinaryOperation(leftOperand, operator, rightOperand) {
+    if (!isBinaryOperatorExpression(operator)) {
+        throw new Error(`invalid binary operator ${JSON.stringify(operator)}`);
+    }
+    return BinaryOperationNode.create(parseReferenceExpression(leftOperand), parseOperator(operator), parseReferenceExpression(rightOperand));
 }
-export function parseOn(args) {
-    return parseFilter('on', args);
+function isBinaryOperatorExpression(expr) {
+    return isBinaryOperator(expr) || isExpression(expr);
 }
-export function parseWhen(args) {
-    return parseFilter('when', args);
+function isComparisonOperatorExpression(expr) {
+    return isComparisonOperator(expr) || isExpression(expr);
 }
-function parseFilter(type, args) {
-    if (args.length === 3) {
-        return parseValueComparison(args[0], args[1], args[2]);
-    }
-    if (args.length === 1) {
-        return parseOneArgFilterExpression(type, args[0]);
-    }
-    throw createFilterExpressionError(type, args);
+function isIsOperator(operator) {
+    return operator === 'is' || operator === 'is not';
 }
-function isIsComparison(operator, rightOperand) {
-    return ((operator === 'is' || operator === 'is not') &&
-        (isNull(rightOperand) || isBoolean(rightOperand)));
+function isNullOrBoolean(value) {
+    return isNull(value) || isBoolean(value);
 }
 function parseIs(leftOperand, operator, rightOperand) {
     return BinaryOperationNode.create(parseReferenceExpression(leftOperand), parseOperator(operator), ValueNode.createImmediate(rightOperand));
@@ -78,78 +68,12 @@ function parseOperator(operator) {
     }
     throw new Error(`invalid operator ${JSON.stringify(operator)}`);
 }
-function parseOneArgFilterExpression(type, arg) {
+function parseExpressionOrFactory(arg) {
     if (isFunction(arg)) {
-        if (type === 'when') {
-            throw new Error(`when method doesn't accept a callback as an argument`);
-        }
-        return CALLBACK_PARSERS[type](arg);
+        return arg(createExpressionBuilder()).toOperationNode();
     }
     else if (isOperationNodeSource(arg)) {
-        const node = arg.toOperationNode();
-        if (RawNode.is(node) ||
-            BinaryOperationNode.is(node) ||
-            UnaryOperationNode.is(node) ||
-            ParensNode.is(node) ||
-            CaseNode.is(node)) {
-            return node;
-        }
-    }
-    else if (type === 'when') {
-        return ValueNode.create(arg);
+        return arg.toOperationNode();
     }
-    throw createFilterExpressionError(type, arg);
-}
-function createFilterExpressionError(type, args) {
-    return new Error(`invalid arguments passed to a '${type}' method: ${JSON.stringify(args)}`);
+    return ValueNode.create(arg);
 }
-const CALLBACK_PARSERS = freeze({
-    where(callback) {
-        // TODO: Remove this once the grouper overload is removed.
-        const whereBuilder = createSelectQueryBuilder();
-        const exprBuilder = expressionBuilder();
-        const res = callback(Object.assign(whereBuilder, exprBuilder));
-        const node = res.toOperationNode();
-        if (SelectQueryNode.is(node)) {
-            if (!node.where) {
-                throw new Error('no `where` methods called inside a group callback');
-            }
-            return ParensNode.create(node.where.where);
-        }
-        else {
-            return node;
-        }
-    },
-    having(callback) {
-        // TODO: Remove this once the grouper overload is removed.
-        const havingBuilder = createSelectQueryBuilder();
-        const exprBuilder = expressionBuilder();
-        const res = callback(Object.assign(havingBuilder, exprBuilder));
-        const node = res.toOperationNode();
-        if (SelectQueryNode.is(node)) {
-            if (!node.having) {
-                throw new Error('no `having` methods called inside a group callback');
-            }
-            return ParensNode.create(node.having.having);
-        }
-        else {
-            return node;
-        }
-    },
-    on(callback) {
-        // TODO: Remove this once the grouper overload is removed.
-        const onBuilder = createJoinBuilder('InnerJoin', 'table');
-        const exprBuilder = expressionBuilder();
-        const res = callback(Object.assign(onBuilder, exprBuilder));
-        const node = res.toOperationNode();
-        if (JoinNode.is(node)) {
-            if (!node.on) {
-                throw new Error('no `on` methods called inside a group callback');
-            }
-            return ParensNode.create(node.on.on);
-        }
-        else {
-            return node;
-        }
-    },
-});

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

@@ -1,2 +1,2 @@
 import { ExtractTypeFromReferenceExpression, ReferenceExpression } from './reference-parser.js';
-export declare type CoalesceReferenceExpressionList<DB, TB extends keyof DB, RE extends unknown[], O = never> = RE extends [] ? O : RE extends [infer L, ...infer R] ? L extends ReferenceExpression<any, any> ? null extends ExtractTypeFromReferenceExpression<DB, TB, L> ? CoalesceReferenceExpressionList<DB, TB, R extends ReferenceExpression<any, any>[] ? R : never, O | ExtractTypeFromReferenceExpression<DB, TB, L>> : Exclude<O, null> | ExtractTypeFromReferenceExpression<DB, TB, L> : never : never;
+export type CoalesceReferenceExpressionList<DB, TB extends keyof DB, RE extends unknown[], O = never> = RE extends [] ? O : RE extends [infer L, ...infer R] ? L extends ReferenceExpression<any, any> ? null extends ExtractTypeFromReferenceExpression<DB, TB, L> ? CoalesceReferenceExpressionList<DB, TB, R extends ReferenceExpression<any, any>[] ? R : never, O | ExtractTypeFromReferenceExpression<DB, TB, L>> : Exclude<O, null> | ExtractTypeFromReferenceExpression<DB, TB, L> : never : never;

package/dist/esm/parser/data-type-parser.d.ts

@@ -1,5 +1,5 @@
 import { Expression } from '../expression/expression.js';
 import { ColumnDataType } from '../operation-node/data-type-node.js';
 import { OperationNode } from '../operation-node/operation-node.js';
-export declare type DataTypeExpression = ColumnDataType | Expression<any>;
+export type DataTypeExpression = ColumnDataType | Expression<any>;
 export declare function parseDataTypeExpression(dataType: DataTypeExpression): OperationNode;

package/dist/esm/parser/default-value-parser.d.ts

@@ -1,4 +1,4 @@
 import { Expression } from '../expression/expression.js';
 import { OperationNode } from '../operation-node/operation-node.js';
-export declare type DefaultValueExpression = unknown | Expression<unknown>;
+export type DefaultValueExpression = unknown | Expression<unknown>;
 export declare function parseDefaultValueExpression(value: DefaultValueExpression): OperationNode;

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

@@ -4,11 +4,11 @@ import { OperationNode } from '../operation-node/operation-node.js';
 import { ExpressionBuilder } from '../expression/expression-builder.js';
 import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
 import { ShallowRecord } from '../util/type-utils.js';
-export declare type ExpressionOrFactory<DB, TB extends keyof DB, V> = SelectQueryBuilder<any, any, ShallowRecord<string, V>> | SelectQueryBuilderFactory<DB, TB, ShallowRecord<string, V>> | Expression<V> | ExpressionFactory<DB, TB, V>;
-export declare type AliasedExpressionOrFactory<DB, TB extends keyof DB> = AliasedExpression<any, any> | AliasedExpressionFactory<DB, TB>;
-declare type SelectQueryBuilderFactory<DB, TB extends keyof DB, V> = (eb: ExpressionBuilder<DB, TB>) => SelectQueryBuilder<any, any, V>;
-declare type ExpressionFactory<DB, TB extends keyof DB, V> = (eb: ExpressionBuilder<DB, TB>) => Expression<V>;
-declare type AliasedExpressionFactory<DB, TB extends keyof DB> = (eb: ExpressionBuilder<DB, TB>) => AliasedExpression<any, any>;
+export type ExpressionOrFactory<DB, TB extends keyof DB, V> = SelectQueryBuilder<any, any, ShallowRecord<string, V>> | SelectQueryBuilderFactory<DB, TB, ShallowRecord<string, V>> | Expression<V> | ExpressionFactory<DB, TB, V>;
+export type AliasedExpressionOrFactory<DB, TB extends keyof DB> = AliasedExpression<any, any> | AliasedExpressionFactory<DB, TB>;
+type SelectQueryBuilderFactory<DB, TB extends keyof DB, V> = (eb: ExpressionBuilder<DB, TB>) => SelectQueryBuilder<any, any, V>;
+type ExpressionFactory<DB, TB extends keyof DB, V> = (eb: ExpressionBuilder<DB, TB>) => Expression<V>;
+type AliasedExpressionFactory<DB, TB extends keyof DB> = (eb: ExpressionBuilder<DB, TB>) => AliasedExpression<any, any>;
 export declare function parseExpression(exp: ExpressionOrFactory<any, any, any>): OperationNode;
 export declare function parseAliasedExpression(exp: AliasedExpressionOrFactory<any, any>): AliasNode;
 export declare function isExpressionOrFactory(obj: unknown): obj is ExpressionOrFactory<any, any, any>;