kysely 0.3.4 → 0.3.9

package/dist/cjs/query-builder/join-builder.d.ts

@@ -1,6 +1,6 @@
 import { JoinNode } from '../operation-node/join-node.js';
 import { OperationNodeSource } from '../operation-node/operation-node-source.js';
-import { ExistsFilterArg, FilterOperatorArg } from '../parser/filter-parser.js';
+import { ExistsExpression, FilterOperator } from '../parser/filter-parser.js';
 import { ReferenceExpression } from '../parser/reference-parser.js';
 import { ValueExpressionOrList } from '../parser/value-parser.js';
 export declare class JoinBuilder<DB, TB extends keyof DB> implements OperationNodeSource {
@@ -12,7 +12,7 @@ export declare class JoinBuilder<DB, TB extends keyof DB> implements OperationNo
      *
      * See {@link QueryBuilder.where} for documentation and examples.
      */
-    on(lhs: ReferenceExpression<DB, TB>, op: FilterOperatorArg, rhs: ValueExpressionOrList<DB, TB>): JoinBuilder<DB, TB>;
+    on<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: FilterOperator, rhs: ValueExpressionOrList<DB, TB, RE>): JoinBuilder<DB, TB>;
     on(grouper: (qb: JoinBuilder<DB, TB>) => JoinBuilder<DB, TB>): JoinBuilder<DB, TB>;
     /**
      * Just like {@link QueryBuilder.orWhere} but adds an item to the join's
@@ -20,7 +20,7 @@ export declare class JoinBuilder<DB, TB extends keyof DB> implements OperationNo
      *
      * See {@link QueryBuilder.orWhere} for documentation and examples.
      */
-    orOn(lhs: ReferenceExpression<DB, TB>, op: FilterOperatorArg, rhs: ValueExpressionOrList<DB, TB>): JoinBuilder<DB, TB>;
+    orOn<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: FilterOperator, rhs: ValueExpressionOrList<DB, TB, RE>): JoinBuilder<DB, TB>;
     orOn(grouper: (qb: JoinBuilder<DB, TB>) => JoinBuilder<DB, TB>): JoinBuilder<DB, TB>;
     /**
      * Just like {@link QueryBuilder.whereRef} but adds an item to the join's
@@ -28,41 +28,41 @@ export declare class JoinBuilder<DB, TB extends keyof DB> implements OperationNo
      *
      * See {@link QueryBuilder.whereRef} for documentation and examples.
      */
-    onRef(lhs: ReferenceExpression<DB, TB>, op: FilterOperatorArg, rhs: ReferenceExpression<DB, TB>): JoinBuilder<DB, TB>;
+    onRef(lhs: ReferenceExpression<DB, TB>, op: FilterOperator, rhs: ReferenceExpression<DB, TB>): JoinBuilder<DB, TB>;
     /**
      * Just like {@link QueryBuilder.orWhereRef} but adds an item to the join's
      * `on` clause instead.
      *
      * See {@link QueryBuilder.orWhereRef} for documentation and examples.
      */
-    orOnRef(lhs: ReferenceExpression<DB, TB>, op: FilterOperatorArg, rhs: ReferenceExpression<DB, TB>): JoinBuilder<DB, TB>;
+    orOnRef(lhs: ReferenceExpression<DB, TB>, op: FilterOperator, rhs: ReferenceExpression<DB, TB>): JoinBuilder<DB, TB>;
     /**
      * Just like {@link QueryBuilder.whereExists} but adds an item to the join's
      * `on` clause instead.
      *
      * See {@link QueryBuilder.whereExists} for documentation and examples.
      */
-    onExists(arg: ExistsFilterArg<DB, TB>): JoinBuilder<DB, TB>;
+    onExists(arg: ExistsExpression<DB, TB>): JoinBuilder<DB, TB>;
     /**
      * Just like {@link QueryBuilder.whereNotExists} but adds an item to the join's
      * `on` clause instead.
      *
      * See {@link QueryBuilder.whereNotExists} for documentation and examples.
      */
-    onNotExists(arg: ExistsFilterArg<DB, TB>): JoinBuilder<DB, TB>;
+    onNotExists(arg: ExistsExpression<DB, TB>): JoinBuilder<DB, TB>;
     /**
      * Just like {@link QueryBuilder.orWhereExists} but adds an item to the join's
      * `on` clause instead.
      *
      * See {@link QueryBuilder.orWhereExists} for documentation and examples.
      */
-    orOnExists(arg: ExistsFilterArg<DB, TB>): JoinBuilder<DB, TB>;
+    orOnExists(arg: ExistsExpression<DB, TB>): JoinBuilder<DB, TB>;
     /**
      * Just like {@link QueryBuilder.orWhereNotExists} but adds an item to the join's
      * `on` clause instead.
      *
      * See {@link QueryBuilder.orWhereNotExists} for documentation and examples.
      */
-    orOnNotExists(arg: ExistsFilterArg<DB, TB>): JoinBuilder<DB, TB>;
+    orOnNotExists(arg: ExistsExpression<DB, TB>): JoinBuilder<DB, TB>;
     toOperationNode(): JoinNode;
 }

package/dist/cjs/query-builder/join-builder.js

@@ -10,10 +10,10 @@ class JoinBuilder {
         this.#joinNode = joinNode;
     }
     on(...args) {
-        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'and', filter_parser_js_1.parseFilterArgs('On', args)));
+        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'and', filter_parser_js_1.parseFilter('On', args)));
     }
     orOn(...args) {
-        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'or', filter_parser_js_1.parseFilterArgs('On', args)));
+        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'or', filter_parser_js_1.parseFilter('On', args)));
     }
     /**
      * Just like {@link QueryBuilder.whereRef} but adds an item to the join's
@@ -22,7 +22,7 @@ class JoinBuilder {
      * See {@link QueryBuilder.whereRef} for documentation and examples.
      */
     onRef(lhs, op, rhs) {
-        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'and', filter_parser_js_1.parseReferenceFilterArgs(lhs, op, rhs)));
+        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'and', filter_parser_js_1.parseReferenceFilter(lhs, op, rhs)));
     }
     /**
      * Just like {@link QueryBuilder.orWhereRef} but adds an item to the join's
@@ -31,7 +31,7 @@ class JoinBuilder {
      * See {@link QueryBuilder.orWhereRef} for documentation and examples.
      */
     orOnRef(lhs, op, rhs) {
-        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'or', filter_parser_js_1.parseReferenceFilterArgs(lhs, op, rhs)));
+        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'or', filter_parser_js_1.parseReferenceFilter(lhs, op, rhs)));
     }
     /**
      * Just like {@link QueryBuilder.whereExists} but adds an item to the join's
@@ -40,7 +40,7 @@ class JoinBuilder {
      * See {@link QueryBuilder.whereExists} for documentation and examples.
      */
     onExists(arg) {
-        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'and', filter_parser_js_1.parseExistsFilterArgs('exists', arg)));
+        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'and', filter_parser_js_1.parseExistExpression('exists', arg)));
     }
     /**
      * Just like {@link QueryBuilder.whereNotExists} but adds an item to the join's
@@ -49,7 +49,7 @@ class JoinBuilder {
      * See {@link QueryBuilder.whereNotExists} for documentation and examples.
      */
     onNotExists(arg) {
-        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'and', filter_parser_js_1.parseExistsFilterArgs('not exists', arg)));
+        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'and', filter_parser_js_1.parseExistExpression('not exists', arg)));
     }
     /**
      * Just like {@link QueryBuilder.orWhereExists} but adds an item to the join's
@@ -58,7 +58,7 @@ class JoinBuilder {
      * See {@link QueryBuilder.orWhereExists} for documentation and examples.
      */
     orOnExists(arg) {
-        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'or', filter_parser_js_1.parseExistsFilterArgs('exists', arg)));
+        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'or', filter_parser_js_1.parseExistExpression('exists', arg)));
     }
     /**
      * Just like {@link QueryBuilder.orWhereNotExists} but adds an item to the join's
@@ -67,7 +67,7 @@ class JoinBuilder {
      * See {@link QueryBuilder.orWhereNotExists} for documentation and examples.
      */
     orOnNotExists(arg) {
-        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'or', filter_parser_js_1.parseExistsFilterArgs('not exists', arg)));
+        return new JoinBuilder(join_node_js_1.joinNode.cloneWithOn(this.#joinNode, 'or', filter_parser_js_1.parseExistExpression('not exists', arg)));
     }
     toOperationNode() {
         return this.#joinNode;