kysely 0.11.0 → 0.11.4

package/dist/cjs/dialect/mysql/mysql-query-compiler.d.ts

@@ -1,7 +1,5 @@
 import { DefaultQueryCompiler } from '../../query-compiler/default-query-compiler.js';
 export declare class MysqlQueryCompiler extends DefaultQueryCompiler {
-    protected visitReturning(): void;
-    protected getSql(): string;
     protected getCurrentParameterPlaceholder(): string;
     protected getLeftIdentifierWrapper(): string;
     protected getRightIdentifierWrapper(): string;

package/dist/cjs/dialect/mysql/mysql-query-compiler.js

@@ -3,12 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlQueryCompiler = void 0;
 const default_query_compiler_js_1 = require("../../query-compiler/default-query-compiler.js");
 class MysqlQueryCompiler extends default_query_compiler_js_1.DefaultQueryCompiler {
-    visitReturning() {
-        // Do nothing.
-    }
-    getSql() {
-        return super.getSql().trimEnd();
-    }
     getCurrentParameterPlaceholder() {
         return '?';
     }

package/dist/cjs/dialect/postgres/postgres-query-compiler.d.ts

@@ -1,3 +1,6 @@
 import { DefaultQueryCompiler } from '../../query-compiler/default-query-compiler.js';
 export declare class PostgresQueryCompiler extends DefaultQueryCompiler {
+    protected getCurrentParameterPlaceholder(): string;
+    protected getLeftIdentifierWrapper(): string;
+    protected getRightIdentifierWrapper(): string;
 }

package/dist/cjs/dialect/postgres/postgres-query-compiler.js

@@ -2,7 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgresQueryCompiler = void 0;
 const default_query_compiler_js_1 = require("../../query-compiler/default-query-compiler.js");
-// The default query compiler is for PostgreSQL.
 class PostgresQueryCompiler extends default_query_compiler_js_1.DefaultQueryCompiler {
+    getCurrentParameterPlaceholder() {
+        return '$' + this.numParameters;
+    }
+    getLeftIdentifierWrapper() {
+        return '"';
+    }
+    getRightIdentifierWrapper() {
+        return '"';
+    }
 }
 exports.PostgresQueryCompiler = PostgresQueryCompiler;

package/dist/cjs/dialect/sqlite/sqlite-adapter.js

@@ -9,10 +9,14 @@ class SqliteAdapter {
         return false;
     }
     async acquireMigrationLock() {
-        // Nothing to do here.
+        // SQLite only has one connection that's reserved by the migration system
+        // for the whole time between acquireMigrationLock and releaseMigrationLock.
+        // We don't need to do anything here.
     }
     async releaseMigrationLock() {
-        // Nothing to do here.
+        // SQLite only has one connection that's reserved by the migration system
+        // for the whole time between acquireMigrationLock and releaseMigrationLock.
+        // We don't need to do anything here.
     }
 }
 exports.SqliteAdapter = SqliteAdapter;

package/dist/cjs/dialect/sqlite/sqlite-driver.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqliteDriver = void 0;
 const compiled_query_js_1 = require("../../query-compiler/compiled-query.js");
 const dynamic_import_js_1 = require("../../util/dynamic-import.js");
+const object_utils_js_1 = require("../../util/object-utils.js");
 class SqliteDriver {
     #config;
     #connectionMutex = new ConnectionMutex();
@@ -19,16 +20,16 @@ class SqliteDriver {
         // into javascript. You can check the built javascript code.
         const DatabaseConstructor = await importBetterSqlite3Database();
         const options = {};
-        if (typeof this.#config.readonly === 'boolean') {
+        if ((0, object_utils_js_1.isBoolean)(this.#config.readonly)) {
             options.readonly = this.#config.readonly;
         }
-        if (typeof this.#config.fileMustExist === 'boolean') {
+        if ((0, object_utils_js_1.isBoolean)(this.#config.fileMustExist)) {
             options.fileMustExist = this.#config.fileMustExist;
         }
-        if (typeof this.#config.timeout === 'number') {
+        if ((0, object_utils_js_1.isNumber)(this.#config.timeout)) {
             options.timeout = this.#config.timeout;
         }
-        if (typeof this.#config.verbose === 'function') {
+        if ((0, object_utils_js_1.isFunction)(this.#config.verbose)) {
             options.verbose = this.#config.verbose;
         }
         this.#db = new DatabaseConstructor(this.#config.databasePath, options);
@@ -38,8 +39,8 @@ class SqliteDriver {
         }
     }
     async acquireConnection() {
-        // sqlite effectively only has one single connection. We use a mutex
-        // here to wait until the single connection has been released.
+        // SQLite only has one single connection. We use a mutex here to wait
+        // until the single connection has been released.
         await this.#connectionMutex.lock();
         return this.#connection;
     }
@@ -65,7 +66,6 @@ async function importBetterSqlite3Database() {
         return await (0, dynamic_import_js_1.importFunction)('better-sqlite3');
     }
     catch (error) {
-        console.error(error);
         throw new Error('SQLite client not installed. Please run `npm install better-sqlite3`');
     }
 }

package/dist/cjs/dialect/sqlite/sqlite-introspector.js

@@ -12,18 +12,31 @@ class SqliteIntrospector {
             .selectFrom('sqlite_schema')
             .where('type', '=', 'table')
             .where('name', 'not like', 'sqlite_%')
-            .select('name');
+            .select('name')
+            .castTo();
         if (!options.withInternalKyselyTables) {
             query = query
                 .where('name', '!=', migration_js_1.MIGRATION_TABLE)
                 .where('name', '!=', migration_js_1.MIGRATION_LOCK_TABLE);
         }
-        const result = await query.execute();
+        const tables = await query.execute();
         return {
-            tables: result.map((it) => ({
-                name: it.name,
-                // TODO: Get columns somehow.
-                columns: [],
+            tables: await Promise.all(tables.map(({ name }) => this.#getTableMetadata(name))),
+        };
+    }
+    async #getTableMetadata(table) {
+        const db = this.#db;
+        const columns = await db
+            .selectFrom(db.raw(`PRAGMA_TABLE_INFO(?)`, [table]).as('table_info'))
+            .select(['name', 'type', 'notnull'])
+            .castTo()
+            .execute();
+        return {
+            name: table,
+            columns: columns.map((col) => ({
+                name: col.name,
+                dataType: col.type,
+                isNullable: !col.notnull,
             })),
         };
     }

package/dist/cjs/dialect/sqlite/sqlite-query-compiler.d.ts

@@ -1,7 +1,7 @@
 import { DefaultQueryCompiler } from '../../query-compiler/default-query-compiler.js';
 export declare class SqliteQueryCompiler extends DefaultQueryCompiler {
-    protected visitReturning(): void;
-    protected getSql(): string;
     protected getCurrentParameterPlaceholder(): string;
+    protected getLeftIdentifierWrapper(): string;
+    protected getRightIdentifierWrapper(): string;
     protected getAutoIncrement(): string;
 }

package/dist/cjs/dialect/sqlite/sqlite-query-compiler.js

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqliteQueryCompiler = void 0;
 const default_query_compiler_js_1 = require("../../query-compiler/default-query-compiler.js");
 class SqliteQueryCompiler extends default_query_compiler_js_1.DefaultQueryCompiler {
-    visitReturning() {
-        // Do nothing.
-    }
-    getSql() {
-        return super.getSql().trimEnd();
-    }
     getCurrentParameterPlaceholder() {
         return '?';
     }
+    getLeftIdentifierWrapper() {
+        return '"';
+    }
+    getRightIdentifierWrapper() {
+        return '"';
+    }
     getAutoIncrement() {
         return 'autoincrement';
     }

package/dist/cjs/driver/runtime-driver.js

@@ -97,7 +97,7 @@ class RuntimeConnection {
     #logQuery(compiledQuery, startTime) {
         this.#log.query(() => ({
             level: 'query',
-            sql: compiledQuery.sql,
+            query: compiledQuery,
             queryDurationMillis: this.#calculateDurationMillis(startTime),
         }));
     }

package/dist/cjs/index.d.ts

@@ -51,35 +51,8 @@ export * from './migration/migration.js';
 export * from './dialect/dialect.js';
 export * from './dialect/dialect-adapter.js';
 export * from './dialect/dialect-adapter-base.js';
-export * from './operation-node/operation-node-transformer.js';
-export * from './operation-node/operation-node-visitor.js';
 export * from './plugin/kysely-plugin.js';
 export * from './plugin/camel-case/camel-case-plugin.js';
-export * from './operation-node/operation-node-transformer.js';
-export * from './operation-node/operation-node-visitor.js';
-export * from './operation-node/operator-node.js';
-export * from './operation-node/or-node.js';
-export * from './operation-node/order-by-item-node.js';
-export * from './operation-node/order-by-node.js';
-export * from './operation-node/parens-node.js';
-export * from './operation-node/primary-constraint-node.js';
-export * from './operation-node/primitive-value-list-node.js';
-export * from './operation-node/query-node.js';
-export * from './operation-node/raw-node.js';
-export * from './operation-node/reference-node.js';
-export * from './operation-node/references-node.js';
-export * from './operation-node/rename-column-node.js';
-export * from './operation-node/returning-node.js';
-export * from './operation-node/select-all-node.js';
-export * from './operation-node/select-query-node.js';
-export * from './operation-node/selection-node.js';
-export * from './operation-node/table-node.js';
-export * from './operation-node/unique-constraint-node.js';
-export * from './operation-node/update-query-node.js';
-export * from './operation-node/value-list-node.js';
-export * from './operation-node/value-node.js';
-export * from './operation-node/where-node.js';
-export * from './operation-node/with-node.js';
 export * from './operation-node/add-column-node.js';
 export * from './operation-node/add-constraint-node.js';
 export * from './operation-node/alias-node.js';
@@ -95,16 +68,20 @@ export * from './operation-node/constraint-node.js';
 export * from './operation-node/create-index-node.js';
 export * from './operation-node/create-schema-node.js';
 export * from './operation-node/create-table-node.js';
+export * from './operation-node/create-view-node.js';
 export * from './operation-node/data-type-node.js';
+export * from './operation-node/default-value-node.js';
 export * from './operation-node/delete-query-node.js';
 export * from './operation-node/drop-column-node.js';
 export * from './operation-node/drop-constraint-node.js';
 export * from './operation-node/drop-index-node.js';
 export * from './operation-node/drop-schema-node.js';
 export * from './operation-node/drop-table-node.js';
+export * from './operation-node/drop-view-node.js';
 export * from './operation-node/filter-node.js';
 export * from './operation-node/foreign-key-constraint-node.js';
 export * from './operation-node/from-node.js';
+export * from './operation-node/generated-always-as-node.js';
 export * from './operation-node/group-by-item-node.js';
 export * from './operation-node/group-by-node.js';
 export * from './operation-node/having-node.js';
@@ -113,19 +90,50 @@ export * from './operation-node/insert-query-node.js';
 export * from './operation-node/join-node.js';
 export * from './operation-node/limit-node.js';
 export * from './operation-node/list-node.js';
+export * from './operation-node/modify-column-node.js';
 export * from './operation-node/offset-node.js';
-export * from './operation-node//on-conflict-node.js';
-export * from './operation-node/operation-node.js';
+export * from './operation-node/on-conflict-node.js';
+export * from './operation-node/on-duplicate-key-node.js';
+export * from './operation-node/on-node.js';
 export * from './operation-node/operation-node-source.js';
+export * from './operation-node/operation-node-transformer.js';
+export * from './operation-node/operation-node-utils.js';
+export * from './operation-node/operation-node-visitor.js';
+export * from './operation-node/operation-node.js';
+export * from './operation-node/operator-node.js';
+export * from './operation-node/or-node.js';
+export * from './operation-node/order-by-item-node.js';
 export * from './operation-node/order-by-node.js';
+export * from './operation-node/parens-node.js';
+export * from './operation-node/primary-constraint-node.js';
+export * from './operation-node/primitive-value-list-node.js';
+export * from './operation-node/query-node.js';
+export * from './operation-node/raw-node.js';
+export * from './operation-node/reference-node.js';
+export * from './operation-node/references-node.js';
+export * from './operation-node/rename-column-node.js';
+export * from './operation-node/returning-node.js';
+export * from './operation-node/select-all-node.js';
+export * from './operation-node/select-query-node.js';
+export * from './operation-node/select-query-node.js';
+export * from './operation-node/selection-node.js';
+export * from './operation-node/table-node.js';
+export * from './operation-node/union-node.js';
+export * from './operation-node/unique-constraint-node.js';
+export * from './operation-node/update-query-node.js';
+export * from './operation-node/value-list-node.js';
+export * from './operation-node/value-node.js';
+export * from './operation-node/where-node.js';
+export * from './operation-node/with-node.js';
 export * from './introspection/database-introspector.js';
 export * from './util/compilable.js';
+export * from './util/log.js';
 export { AnyColumn, UnknownRow, AnyQueryBuilder } from './util/type-utils.js';
 export { SelectExpression, SelectExpressionOrList, } from './parser/select-parser.js';
 export { ReferenceExpression, ReferenceExpressionOrList, } from './parser/reference-parser.js';
 export { ValueExpression, ValueExpressionOrList, } from './parser/value-parser.js';
 export { ExistsExpression, FilterOperator } from './parser/filter-parser.js';
-export { TableExpression } from './parser/table-parser.js';
+export { TableExpression, TableExpressionOrList, } from './parser/table-parser.js';
 export { JoinReferenceExpression, JoinCallbackExpression, } from './parser/join-parser.js';
 export { InsertObject } from './parser/insert-values-parser.js';
 export { MutationObject } from './parser/update-set-parser.js';

package/dist/cjs/index.js

@@ -63,35 +63,8 @@ __exportStar(require("./migration/migration.js"), exports);
 __exportStar(require("./dialect/dialect.js"), exports);
 __exportStar(require("./dialect/dialect-adapter.js"), exports);
 __exportStar(require("./dialect/dialect-adapter-base.js"), exports);
-__exportStar(require("./operation-node/operation-node-transformer.js"), exports);
-__exportStar(require("./operation-node/operation-node-visitor.js"), exports);
 __exportStar(require("./plugin/kysely-plugin.js"), exports);
 __exportStar(require("./plugin/camel-case/camel-case-plugin.js"), exports);
-__exportStar(require("./operation-node/operation-node-transformer.js"), exports);
-__exportStar(require("./operation-node/operation-node-visitor.js"), exports);
-__exportStar(require("./operation-node/operator-node.js"), exports);
-__exportStar(require("./operation-node/or-node.js"), exports);
-__exportStar(require("./operation-node/order-by-item-node.js"), exports);
-__exportStar(require("./operation-node/order-by-node.js"), exports);
-__exportStar(require("./operation-node/parens-node.js"), exports);
-__exportStar(require("./operation-node/primary-constraint-node.js"), exports);
-__exportStar(require("./operation-node/primitive-value-list-node.js"), exports);
-__exportStar(require("./operation-node/query-node.js"), exports);
-__exportStar(require("./operation-node/raw-node.js"), exports);
-__exportStar(require("./operation-node/reference-node.js"), exports);
-__exportStar(require("./operation-node/references-node.js"), exports);
-__exportStar(require("./operation-node/rename-column-node.js"), exports);
-__exportStar(require("./operation-node/returning-node.js"), exports);
-__exportStar(require("./operation-node/select-all-node.js"), exports);
-__exportStar(require("./operation-node/select-query-node.js"), exports);
-__exportStar(require("./operation-node/selection-node.js"), exports);
-__exportStar(require("./operation-node/table-node.js"), exports);
-__exportStar(require("./operation-node/unique-constraint-node.js"), exports);
-__exportStar(require("./operation-node/update-query-node.js"), exports);
-__exportStar(require("./operation-node/value-list-node.js"), exports);
-__exportStar(require("./operation-node/value-node.js"), exports);
-__exportStar(require("./operation-node/where-node.js"), exports);
-__exportStar(require("./operation-node/with-node.js"), exports);
 __exportStar(require("./operation-node/add-column-node.js"), exports);
 __exportStar(require("./operation-node/add-constraint-node.js"), exports);
 __exportStar(require("./operation-node/alias-node.js"), exports);
@@ -107,16 +80,20 @@ __exportStar(require("./operation-node/constraint-node.js"), exports);
 __exportStar(require("./operation-node/create-index-node.js"), exports);
 __exportStar(require("./operation-node/create-schema-node.js"), exports);
 __exportStar(require("./operation-node/create-table-node.js"), exports);
+__exportStar(require("./operation-node/create-view-node.js"), exports);
 __exportStar(require("./operation-node/data-type-node.js"), exports);
+__exportStar(require("./operation-node/default-value-node.js"), exports);
 __exportStar(require("./operation-node/delete-query-node.js"), exports);
 __exportStar(require("./operation-node/drop-column-node.js"), exports);
 __exportStar(require("./operation-node/drop-constraint-node.js"), exports);
 __exportStar(require("./operation-node/drop-index-node.js"), exports);
 __exportStar(require("./operation-node/drop-schema-node.js"), exports);
 __exportStar(require("./operation-node/drop-table-node.js"), exports);
+__exportStar(require("./operation-node/drop-view-node.js"), exports);
 __exportStar(require("./operation-node/filter-node.js"), exports);
 __exportStar(require("./operation-node/foreign-key-constraint-node.js"), exports);
 __exportStar(require("./operation-node/from-node.js"), exports);
+__exportStar(require("./operation-node/generated-always-as-node.js"), exports);
 __exportStar(require("./operation-node/group-by-item-node.js"), exports);
 __exportStar(require("./operation-node/group-by-node.js"), exports);
 __exportStar(require("./operation-node/having-node.js"), exports);
@@ -125,10 +102,41 @@ __exportStar(require("./operation-node/insert-query-node.js"), exports);
 __exportStar(require("./operation-node/join-node.js"), exports);
 __exportStar(require("./operation-node/limit-node.js"), exports);
 __exportStar(require("./operation-node/list-node.js"), exports);
+__exportStar(require("./operation-node/modify-column-node.js"), exports);
 __exportStar(require("./operation-node/offset-node.js"), exports);
-__exportStar(require("./operation-node//on-conflict-node.js"), exports);
-__exportStar(require("./operation-node/operation-node.js"), exports);
+__exportStar(require("./operation-node/on-conflict-node.js"), exports);
+__exportStar(require("./operation-node/on-duplicate-key-node.js"), exports);
+__exportStar(require("./operation-node/on-node.js"), exports);
 __exportStar(require("./operation-node/operation-node-source.js"), exports);
+__exportStar(require("./operation-node/operation-node-transformer.js"), exports);
+__exportStar(require("./operation-node/operation-node-utils.js"), exports);
+__exportStar(require("./operation-node/operation-node-visitor.js"), exports);
+__exportStar(require("./operation-node/operation-node.js"), exports);
+__exportStar(require("./operation-node/operator-node.js"), exports);
+__exportStar(require("./operation-node/or-node.js"), exports);
+__exportStar(require("./operation-node/order-by-item-node.js"), exports);
 __exportStar(require("./operation-node/order-by-node.js"), exports);
+__exportStar(require("./operation-node/parens-node.js"), exports);
+__exportStar(require("./operation-node/primary-constraint-node.js"), exports);
+__exportStar(require("./operation-node/primitive-value-list-node.js"), exports);
+__exportStar(require("./operation-node/query-node.js"), exports);
+__exportStar(require("./operation-node/raw-node.js"), exports);
+__exportStar(require("./operation-node/reference-node.js"), exports);
+__exportStar(require("./operation-node/references-node.js"), exports);
+__exportStar(require("./operation-node/rename-column-node.js"), exports);
+__exportStar(require("./operation-node/returning-node.js"), exports);
+__exportStar(require("./operation-node/select-all-node.js"), exports);
+__exportStar(require("./operation-node/select-query-node.js"), exports);
+__exportStar(require("./operation-node/select-query-node.js"), exports);
+__exportStar(require("./operation-node/selection-node.js"), exports);
+__exportStar(require("./operation-node/table-node.js"), exports);
+__exportStar(require("./operation-node/union-node.js"), exports);
+__exportStar(require("./operation-node/unique-constraint-node.js"), exports);
+__exportStar(require("./operation-node/update-query-node.js"), exports);
+__exportStar(require("./operation-node/value-list-node.js"), exports);
+__exportStar(require("./operation-node/value-node.js"), exports);
+__exportStar(require("./operation-node/where-node.js"), exports);
+__exportStar(require("./operation-node/with-node.js"), exports);
 __exportStar(require("./introspection/database-introspector.js"), exports);
 __exportStar(require("./util/compilable.js"), exports);
+__exportStar(require("./util/log.js"), exports);

package/dist/cjs/kysely.d.ts

@@ -10,7 +10,7 @@ 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.
  *
@@ -235,17 +235,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:
+     * @example
+     * ```ts
+     * const db = new Kysely<Database>({
+     *   dialect: new PostgresDialect(postgresConfig),
+     *   log: ['query', 'error']
+     * })
+     * ```
      *
-     *  - query: Log each query's SQL and duration using console.log
-     *  - error: Log all query errors using console.error
+     * @example
+     * ```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/cjs/operation-node/alias-node.d.ts

@@ -5,7 +5,7 @@ import { RawNode } from './raw-node.js';
 import { ReferenceNode } from './reference-node.js';
 import { SelectQueryNode } from './select-query-node.js';
 import { TableNode } from './table-node.js';
-export declare type AliasNodeChild = ColumnNode | ReferenceNode | TableNode | RawNode | SelectQueryNode;
+export declare type AliasNodeChild = ColumnNode | ReferenceNode | TableNode | SelectQueryNode | RawNode;
 export interface AliasNode extends OperationNode {
     readonly kind: 'AliasNode';
     readonly node: AliasNodeChild;

package/dist/cjs/operation-node/operation-node-utils.d.ts

@@ -14,4 +14,4 @@ import { ValueNode } from './value-node.js';
 export declare type ReferenceExpressionNode = ColumnNode | ReferenceNode | SelectQueryNode | RawNode;
 export declare type ValueExpressionNode = ValueNode | ValueListNode | PrimitiveValueListNode | ReferenceExpressionNode;
 export declare type TableExpressionNode = TableNode | AliasNode;
-export declare type FilterExpressionNode = FilterNode | AndNode | OrNode | ParensNode;
+export declare type FilterExpressionNode = FilterNode | AndNode | OrNode | ParensNode | RawNode;

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

@@ -12,3 +12,4 @@ export declare function parseOnFilter(ctx: ParseContext, args: any[]): FilterExp
 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;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseNotExistFilter = exports.parseExistFilter = exports.parseReferenceFilter = exports.parseOnFilter = exports.parseHavingFilter = exports.parseWhereFilter = void 0;
+exports.parseFilter = exports.parseNotExistFilter = exports.parseExistFilter = exports.parseReferenceFilter = exports.parseOnFilter = exports.parseHavingFilter = exports.parseWhereFilter = void 0;
 const filter_node_js_1 = require("../operation-node/filter-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
@@ -12,39 +12,15 @@ const value_parser_js_1 = require("./value-parser.js");
 const select_query_node_js_1 = require("../operation-node/select-query-node.js");
 const value_node_js_1 = require("../operation-node/value-node.js");
 function parseWhereFilter(ctx, args) {
-    if (args.length === 3) {
-        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
-    }
-    else if (args.length === 1 && (0, object_utils_js_1.isFunction)(args[0])) {
-        return parseWhereGroup(ctx, args[0]);
-    }
-    else {
-        throw new Error(`invalid arguments passed to a where method ${JSON.stringify(args)}`);
-    }
+    return parseFilter(ctx, 'where', args);
 }
 exports.parseWhereFilter = parseWhereFilter;
 function parseHavingFilter(ctx, args) {
-    if (args.length === 3) {
-        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
-    }
-    else if (args.length === 1 && (0, object_utils_js_1.isFunction)(args[0])) {
-        return parseHavingGroup(ctx, args[0]);
-    }
-    else {
-        throw new Error(`invalid arguments passed to a having method ${JSON.stringify(args)}`);
-    }
+    return parseFilter(ctx, 'having', args);
 }
 exports.parseHavingFilter = parseHavingFilter;
 function parseOnFilter(ctx, args) {
-    if (args.length === 3) {
-        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
-    }
-    else if (args.length === 1 && (0, object_utils_js_1.isFunction)(args[0])) {
-        return parseOnGroup(ctx, args[0]);
-    }
-    else {
-        throw new Error(`invalid arguments passed to an on method ${JSON.stringify(args)}`);
-    }
+    return parseFilter(ctx, 'on', args);
 }
 exports.parseOnFilter = parseOnFilter;
 function parseReferenceFilter(ctx, lhs, op, rhs) {
@@ -59,6 +35,25 @@ function parseNotExistFilter(ctx, arg) {
     return parseExistExpression(ctx, 'not exists', arg);
 }
 exports.parseNotExistFilter = parseNotExistFilter;
+function parseFilter(ctx, type, args) {
+    if (args.length === 3) {
+        return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
+    }
+    else if (args.length === 1) {
+        const arg = args[0];
+        if ((0, object_utils_js_1.isFunction)(arg)) {
+            return GROUP_PARSERS[type](ctx, arg);
+        }
+        else if ((0, operation_node_source_js_1.isOperationNodeSource)(arg)) {
+            const node = arg.toOperationNode();
+            if (raw_node_js_1.RawNode.is(node)) {
+                return node;
+            }
+        }
+    }
+    throw new Error(`invalid arguments passed to a '${type}' method: ${JSON.stringify(args)}`);
+}
+exports.parseFilter = parseFilter;
 function parseThreeArgFilter(ctx, left, op, right) {
     if ((op === 'is' || op === 'is not') && ((0, object_utils_js_1.isNull)(right) || (0, object_utils_js_1.isBoolean)(right))) {
         return parseIsFilter(ctx, left, op, right);
@@ -79,30 +74,6 @@ function parseFilterOperator(op) {
     }
     throw new Error(`invalid comparison operator ${JSON.stringify(op)} passed to a filter method`);
 }
-function parseWhereGroup(ctx, callback) {
-    const query = callback(ctx.createSelectQueryBuilder([]));
-    const queryNode = query.toOperationNode();
-    if (!queryNode.where) {
-        throw new Error('no `where*` methods called insided a group callback');
-    }
-    return parens_node_js_1.ParensNode.create(queryNode.where.where);
-}
-function parseHavingGroup(ctx, callback) {
-    const query = callback(ctx.createSelectQueryBuilder([]));
-    const queryNode = query.toOperationNode();
-    if (!queryNode.having) {
-        throw new Error('no `having*` methods called insided a group callback');
-    }
-    return parens_node_js_1.ParensNode.create(queryNode.having.having);
-}
-function parseOnGroup(ctx, callback) {
-    const joinBuilder = callback(ctx.createJoinBuilder('InnerJoin', 'table'));
-    const joinNode = joinBuilder.toOperationNode();
-    if (!joinNode.on) {
-        throw new Error('no `on*` methods called insided a group callback');
-    }
-    return parens_node_js_1.ParensNode.create(joinNode.on.on);
-}
 function parseExistExpression(ctx, type, arg) {
     const node = (0, object_utils_js_1.isFunction)(arg)
         ? arg(ctx.createExpressionBuilder()).toOperationNode()
@@ -112,3 +83,29 @@ function parseExistExpression(ctx, type, arg) {
     }
     return filter_node_js_1.FilterNode.create(undefined, operator_node_js_1.OperatorNode.create(type), node);
 }
+const GROUP_PARSERS = (0, object_utils_js_1.freeze)({
+    where(ctx, callback) {
+        const query = callback(ctx.createSelectQueryBuilder([]));
+        const queryNode = query.toOperationNode();
+        if (!queryNode.where) {
+            throw new Error('no `where` methods called insided a group callback');
+        }
+        return parens_node_js_1.ParensNode.create(queryNode.where.where);
+    },
+    having(ctx, callback) {
+        const query = callback(ctx.createSelectQueryBuilder([]));
+        const queryNode = query.toOperationNode();
+        if (!queryNode.having) {
+            throw new Error('no `having` methods called insided a group callback');
+        }
+        return parens_node_js_1.ParensNode.create(queryNode.having.having);
+    },
+    on(ctx, callback) {
+        const joinBuilder = callback(ctx.createJoinBuilder('InnerJoin', 'table'));
+        const joinNode = joinBuilder.toOperationNode();
+        if (!joinNode.on) {
+            throw new Error('no `on` methods called insided a group callback');
+        }
+        return parens_node_js_1.ParensNode.create(joinNode.on.on);
+    },
+});

package/dist/cjs/parser/insert-values-parser.d.ts

@@ -3,13 +3,14 @@ import { InsertValuesNode } from '../operation-node/insert-query-node.js';
 import { RawNode } from '../operation-node/raw-node.js';
 import { SelectQueryNode } from '../operation-node/select-query-node.js';
 import { ValueNode } from '../operation-node/value-node.js';
-import { AnyQueryBuilder, AnyRawBuilder, GeneratedPlaceholder } from '../util/type-utils.js';
+import { AnyQueryBuilder, AnyRawBuilder, GeneratedPlaceholder, QueryBuilderFactory, RawBuilderFactory } from '../util/type-utils.js';
 import { PrimitiveValue } from '../util/object-utils.js';
+import { ParseContext } from './parse-context.js';
 export declare type InsertObject<DB, TB extends keyof DB> = {
-    [C in keyof DB[TB]]: InsertValueExpression<DB[TB][C]>;
+    [C in keyof DB[TB]]: InsertValueExpression<DB, TB, DB[TB][C]>;
 };
 export declare type InsertObjectOrList<DB, TB extends keyof DB> = InsertObject<DB, TB> | ReadonlyArray<InsertObject<DB, TB>>;
-declare type InsertValueExpression<T> = T | AnyQueryBuilder | AnyRawBuilder | GeneratedPlaceholder;
-export declare function parseInsertObjectOrList(args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>, ReadonlyArray<InsertValuesNode>];
-export declare function parseInsertValueExpression(value: InsertValueExpression<PrimitiveValue>): ValueNode | RawNode | SelectQueryNode;
+declare type InsertValueExpression<DB, TB extends keyof DB, T> = T | AnyQueryBuilder | QueryBuilderFactory<DB, TB> | AnyRawBuilder | RawBuilderFactory<DB, TB> | GeneratedPlaceholder;
+export declare function parseInsertObjectOrList(ctx: ParseContext, args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>, ReadonlyArray<InsertValuesNode>];
+export declare function parseInsertValueExpression(ctx: ParseContext, value: InsertValueExpression<any, any, PrimitiveValue>): ValueNode | RawNode | SelectQueryNode;
 export {};