kysely 0.22.0 → 0.23.0

package/CONTRIBUTING.md

@@ -0,0 +1,70 @@
+Would love to contribute to Kysely?
+
+Awesome! We are not very organized yet. We don't have a plan or a roadmap.
+
+Probably the best way to get going is to watch the issue list.
+An issue with a `greenlit` label, has been acknowledged by the team and is ready for development.
+Find such an issue you'd like to tackle and ask to be assigned to it in the comment section.
+Feel free to open an issue if you found a bug or a missing feature you'd like to work on,
+and there aren't any issues mentioning it.
+
+If you start working on something larger, it's a good idea to create a draft (WIP) PR at 
+an early stage so that we can guide you to the right direction.
+
+There are quite a few guidelines to keep in mind:
+
+* Kysely should have zero dependencies.
+
+* Kysely should work in all javascript environments (node.js, deno & modern browsers), 
+even though the main focus is node.js.
+
+* Everything is immutable.
+
+* The API should be as close to writing raw SQL as possible while still providing 
+type safety.
+
+* Everything outside of dialect implementations is dialect-agnostic.
+
+* Everything is tested.
+
+    * Functionality - No mocks. Everything is tested against real database instances.
+    No partial testing. If a sql "thing" is supported by some databases, test it
+    against all of them.
+
+    * Types - We're a type-safe package, you get the idea.
+
+* Everything consumer-facing should be documented.
+
+* Everything is type-safe. Things that cannot be implemented in a way that is safe 
+for all cases, are best left for consumers to implement.
+
+* Most features should have escape hatches.
+
+# Getting started
+
+1. fork kysely.
+
+2. clone your fork.
+
+3. install node.js (preferable latest LTS).
+
+4. run `npm i` in your terminal to install dev dependencies.
+
+5. create a branch.
+
+6. create a draft pull request. link the relevant issue by refering to it in the 
+PR's description. E.g. `closes #123` will link the PR to issue/pull request #123.
+
+7. implement your changes.
+
+# Testing
+
+1. write functionality tests in `test/node`.
+
+2. write typings tests in `test/typings/test-d`
+
+3. install docker.
+
+4. run `docker-compose up` in your terminal to spin up database instances.
+
+5. run `npm test` in your terminal to run tests.

package/README.md

@@ -24,6 +24,9 @@ Of course there are cases where things cannot be typed at compile time, and Kyse
 hatches for these situations. See the [sql template tag](https://koskimas.github.io/kysely/interfaces/Sql.html) 
 and the [DynamicModule](https://koskimas.github.io/kysely/classes/DynamicModule.html#ref) for more info.
 
+All API documentation is written in the typing files and you can simply `cmd-click` on the module, class
+or method you're using to see it. The same documentation is also hosted [here](https://github.com/koskimas/kysely).
+
 If you start using Kysely and can't find something you'd want to use, please open an issue or join our
 [discord server](https://discord.gg/xyBJ3GwvAm).
 
@@ -41,6 +44,7 @@ You can find a more thorough introduction [here](https://www.jakso.me/blog/kysel
   - [Update queries](#update-queries)
   - [Insert queries](#insert-queries)
   - [Delete queries](#delete-queries)
+- [Recipes](#recipes)
 - [Migrations](#migrations)
     - [PostgreSQL migration example](#postgresql-migration-example)
     - [MySQL migration example](#mysql-migration-example)
@@ -66,10 +70,13 @@ npm install kysely better-sqlite3
 More dialects will be added soon. Kysely also has a simple interface
 for [3rd party dialects](https://koskimas.github.io/kysely/interfaces/Dialect.html).
 
-### 3rd party dialects:
+### 3rd party dialects
 
  - [AWS Data API](https://github.com/serverless-stack/kysely-data-api)
  - [PlanetScale Serverless Driver](https://github.com/depot/kysely-planetscale)
+ - [SingleStore Data API](https://github.com/igalklebanov/kysely-singlestore)
+ - [D1](https://github.com/aidenwallis/kysely-d1)
+ - [SurrealDB](https://github.com/igalklebanov/kysely-surrealdb)
 
 # Minimal example
 
@@ -246,6 +253,17 @@ documentation.
 See the [deleteFrom method](https://koskimas.github.io/kysely/classes/Kysely.html#deleteFrom)
 documentation.
 
+# Recipes
+
+The [recipes](https://github.com/koskimas/kysely/tree/master/recipes) folder contains a bunch of small tutorials
+or "recipes" for common use cases.
+
+* [Conditional selects](https://github.com/koskimas/kysely/tree/master/recipes/conditional-selects.md)
+* [Deduplicate joins](https://github.com/koskimas/kysely/tree/master/recipes/deduplicate-joins.md)
+* [Extending kysely](https://github.com/koskimas/kysely/tree/master/recipes/extending-kysely.md)
+* [Raw SQL](https://github.com/koskimas/kysely/tree/master/recipes/raw-sql.md)
+* [Schemas](https://github.com/koskimas/kysely/tree/master/recipes/schemas.md)
+
 # Migrations
 
 Migration files should look like this:
@@ -285,7 +303,7 @@ when you instantiate one.
 ### PostgreSQL migration example
 
 ```ts
-import { Kysely } from 'kysely'
+import { Kysely, sql } from 'kysely'
 
 export async function up(db: Kysely<any>): Promise<void> {
   await db.schema
@@ -294,6 +312,7 @@ export async function up(db: Kysely<any>): Promise<void> {
     .addColumn('first_name', 'varchar', (col) => col.notNull())
     .addColumn('last_name', 'varchar')
     .addColumn('gender', 'varchar(50)', (col) => col.notNull())
+    .addColumn('created_at', 'timestamp', (col) => col.defaultTo(sql`now()`).notNull())
     .execute()
 
   await db.schema
@@ -544,3 +563,7 @@ in knex. Bringing the type system and the changes to knex would mean very signif
 that aren't possible at this point of the project. Knex was also originally written for javascript and
 the typescript typings were added afterwards. That always leads to compromises in the types. Designing
 a library for typescript from the ground up produces much better and simpler types.
+
+# How to contribute to Kysely
+
+See [CONTRIBUTING.md](./CONTRIBUTING.md).

package/dist/cjs/dialect/database-introspector.d.ts

@@ -49,6 +49,10 @@ export interface ColumnMetadata {
      *       on PostgreSQL, `INTEGER` on SQLite and `int` on MySQL.
      */
     readonly dataType: string;
+    /**
+     * The schema this column's data type was created in.
+     */
+    readonly dataTypeSchema?: string;
     readonly isAutoIncrementing: boolean;
     readonly isNullable: boolean;
     readonly hasDefaultValue: boolean;

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

@@ -87,15 +87,18 @@ class MysqlConnection {
             const result = await this.#executeQuery(compiledQuery);
             if (isOkPacket(result)) {
                 const { insertId, affectedRows } = result;
+                const numAffectedRows = affectedRows !== undefined && affectedRows !== null
+                    ? BigInt(affectedRows)
+                    : undefined;
                 return {
                     insertId: insertId !== undefined &&
                         insertId !== null &&
                         insertId.toString() !== '0'
                         ? BigInt(insertId)
                         : undefined,
-                    numUpdatedOrDeletedRows: affectedRows !== undefined && insertId !== null
-                        ? BigInt(affectedRows)
-                        : undefined,
+                    // TODO: remove.
+                    numUpdatedOrDeletedRows: numAffectedRows,
+                    numAffectedRows,
                     rows: [],
                 };
             }

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

@@ -4,7 +4,7 @@ exports.PostgresAdapter = void 0;
 const sql_js_1 = require("../../raw-builder/sql.js");
 const dialect_adapter_base_js_1 = require("../dialect-adapter-base.js");
 // Random id for our transaction lock.
-const LOCK_ID = 3853314791062309107n;
+const LOCK_ID = BigInt('3853314791062309107');
 class PostgresAdapter extends dialect_adapter_base_js_1.DialectAdapterBase {
     get supportsTransactionalDdl() {
         return true;

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

@@ -72,9 +72,14 @@ class PostgresConnection {
             const result = await this.#client.query(compiledQuery.sql, [
                 ...compiledQuery.parameters,
             ]);
-            if (result.command === 'UPDATE' || result.command === 'DELETE') {
+            if (result.command === 'INSERT' ||
+                result.command === 'UPDATE' ||
+                result.command === 'DELETE') {
+                const numAffectedRows = BigInt(result.rowCount);
                 return {
-                    numUpdatedOrDeletedRows: BigInt(result.rowCount),
+                    // TODO: remove.
+                    numUpdatedOrDeletedRows: numAffectedRows,
+                    numAffectedRows,
                     rows: result.rows ?? [],
                 };
             }

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

@@ -19,10 +19,16 @@ class PostgresIntrospector {
     }
     async getTables(options = { withInternalKyselyTables: false }) {
         let query = this.#db
+            // column
             .selectFrom('pg_catalog.pg_attribute as a')
+            // table
             .innerJoin('pg_catalog.pg_class as c', 'a.attrelid', 'c.oid')
+            // table schema
             .innerJoin('pg_catalog.pg_namespace as ns', 'c.relnamespace', 'ns.oid')
+            // column data type
             .innerJoin('pg_catalog.pg_type as typ', 'a.atttypid', 'typ.oid')
+            // column data type schema
+            .innerJoin('pg_catalog.pg_namespace as dtns', 'typ.typnamespace', 'dtns.oid')
             .select([
             'a.attname as column',
             'a.attnotnull as not_null',
@@ -30,6 +36,7 @@ class PostgresIntrospector {
             'c.relname as table',
             'ns.nspname as schema',
             'typ.typname as type',
+            'dtns.nspname as type_schema',
             // Detect if the column is auto incrementing by finding the sequence
             // that is created for `serial` and `bigserial` columns.
             this.#db
@@ -79,6 +86,7 @@ class PostgresIntrospector {
             table.columns.push((0, object_utils_js_1.freeze)({
                 name: it.column,
                 dataType: it.type,
+                dataTypeSchema: it.type_schema,
                 isNullable: !it.not_null,
                 isAutoIncrementing: !!it.auto_incrementing,
                 hasDefaultValue: it.has_default,

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

@@ -58,10 +58,11 @@ class SqliteConnection {
         }
         else {
             const { changes, lastInsertRowid } = stmt.run(parameters);
+            const numAffectedRows = changes !== undefined && changes !== null ? BigInt(changes) : undefined;
             return Promise.resolve({
-                numUpdatedOrDeletedRows: changes !== undefined && changes !== null
-                    ? BigInt(changes)
-                    : undefined,
+                // TODO: remove.
+                numUpdatedOrDeletedRows: numAffectedRows,
+                numAffectedRows,
                 insertId: lastInsertRowid !== undefined && lastInsertRowid !== null
                     ? BigInt(lastInsertRowid)
                     : undefined,

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

@@ -46,6 +46,7 @@ class SqliteIntrospector {
         const autoIncrementCol = createSql[0]?.sql
             ?.split(/[\(\),]/)
             ?.find((it) => it.toLowerCase().includes('autoincrement'))
+            ?.trimStart()
             ?.split(/\s+/)?.[0]
             ?.replace(/["`]/g, '');
         const columns = await db

package/dist/cjs/driver/database-connection.d.ts

@@ -10,10 +10,14 @@ export interface DatabaseConnection {
 }
 export interface QueryResult<O> {
     /**
-     * This is defined for update and delete queries and contains
-     * the number of rows the query updated/deleted.
+     * @deprecated use {@link QueryResult.numAffectedRows} instead.
      */
     readonly numUpdatedOrDeletedRows?: bigint;
+    /**
+     * This is defined for insert, update and delete queries and contains
+     * the number of rows the query inserted/updated/deleted.
+     */
+    readonly numAffectedRows?: bigint;
     /**
      * This is defined for insert queries on dialects that return
      * the auto incrementing primary key from an insert.

package/dist/cjs/dynamic/dynamic-reference-builder.d.ts

@@ -1,6 +1,5 @@
-import { ColumnNode } from '../operation-node/column-node.js';
 import { OperationNodeSource } from '../operation-node/operation-node-source.js';
-import { ReferenceNode } from '../operation-node/reference-node.js';
+import { SimpleReferenceExpressionNode } from '../operation-node/simple-reference-expression-node.js';
 export declare class DynamicReferenceBuilder<R extends string = never> implements OperationNodeSource {
     #private;
     get dynamicReference(): string;
@@ -14,6 +13,6 @@ export declare class DynamicReferenceBuilder<R extends string = never> implement
      */
     protected get refType(): R;
     constructor(reference: string);
-    toOperationNode(): ReferenceNode | ColumnNode;
+    toOperationNode(): SimpleReferenceExpressionNode;
 }
 export declare function isDynamicReferenceBuilder(obj: unknown): obj is DynamicReferenceBuilder<any>;

package/dist/cjs/dynamic/dynamic-reference-builder.js

@@ -24,7 +24,7 @@ class DynamicReferenceBuilder {
         this.#dynamicReference = reference;
     }
     toOperationNode() {
-        return (0, reference_parser_js_1.parseStringReference)(this.#dynamicReference);
+        return (0, reference_parser_js_1.parseSimpleReferenceExpression)(this.#dynamicReference);
     }
 }
 exports.DynamicReferenceBuilder = DynamicReferenceBuilder;

package/dist/cjs/expression/expression.d.ts

@@ -0,0 +1,100 @@
+import { AliasNode } from '../operation-node/alias-node.js';
+import { OperationNodeSource } from '../operation-node/operation-node-source.js';
+import { OperationNode } from '../operation-node/operation-node.js';
+/**
+ * `Expression` represents an arbitrary SQL expression with a type.
+ *
+ * Most Kysely methods accept instances of `Expression` and most classes like `SelectQueryBuilder`
+ * and the return value of the {@link sql} template tag implement it.
+ *
+ * ```ts
+ * const exp1: Expression<string> = sql<string>`CONCAT('hello', ' ', 'world')`
+ * const exp2: Expression<{ first_name: string }> = db.selectFrom('person').select('first_name')
+ * ```
+ *
+ * You can implement the `Expression` interface to create your own type-safe utilities for Kysely.
+ */
+export interface Expression<T> extends OperationNodeSource {
+    /**
+     * All expressions need to have this getter for complicated type-related reasons.
+     * Simply add this getter for your expression and always return `undefined` from it:
+     *
+     * ```ts
+     * class SomeExpression<T> implements Expression<T> {
+     *   get expressionType(): T | undefined {
+     *     return undefined
+     *   }
+     * }
+     * ```
+     *
+     * The getter is needed to make the expression assignable to another expression only
+     * if the types `T` are assignable. Without this property (or some other property
+     * that references `T`), you could assing `Expression<string>` to `Expression<number>`.
+     */
+    get expressionType(): T | undefined;
+    /**
+     * Creates the OperationNode that describes how to compile this expression into SQL.
+     *
+     * If you are creating a custom expression, it's often easiest to use the {@link sql}
+     * template tag to build the node:
+     *
+     * ```ts
+     * class SomeExpression<T> implements Expression<T> {
+     *   toOperationNode(): OperationNode {
+     *     return sql`some sql here`.toOperationNode()
+     *   }
+     * }
+     * ```
+     */
+    toOperationNode(): OperationNode;
+}
+/**
+ * Just like `Expression<T>` but also holds an alias type `A`.
+ *
+ * `AliasedExpression<T, A>` can be used in places where, in addition to the value type `T`, you
+ * also need a name `A` for that value. For example anything you can pass into the `select` method
+ * needs to implement an `AliasedExpression<T, A>`. `A` becomes the name of the selected expression
+ * in the result and `T` becomes its type.
+ *
+ * @example
+ *
+ * ```ts
+ * class SomeAliasedExpression<T, A extends string> implements AliasedExpression<T, A> {
+ *   #expression: Expression<T>
+ *   #alias: A
+ *
+ *   constructor(expression: Expression<T>, alias: A) {
+ *     this.#expression = expression
+ *     this.#alias = alias
+ *   }
+ *
+ *   get expression(): Expression<T> {
+ *     return this.#expression
+ *   }
+ *
+ *   get alias(): A {
+ *     return this.#alias
+ *   }
+ *
+ *   toOperationNode(): AliasNode {
+ *     return AliasNode.create(this.#expression.toOperationNode(), IdentifierNode.create(this.#alias))
+ *   }
+ * }
+ * ```
+ */
+export interface AliasedExpression<T, A extends string> extends OperationNodeSource {
+    /**
+     * Returns the aliased expression.
+     */
+    get expression(): Expression<T>;
+    /**
+     * Returns the alias.
+     */
+    get alias(): A;
+    /**
+     * Creates the OperationNode that describes how to compile this expression into SQL.
+     */
+    toOperationNode(): AliasNode;
+}
+export declare function isExpression(obj: unknown): obj is Expression<any>;
+export declare function isAliasedExpression(obj: unknown): obj is AliasedExpression<any, any>;

package/dist/cjs/expression/expression.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAliasedExpression = exports.isExpression = void 0;
+const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
+const object_utils_js_1 = require("../util/object-utils.js");
+function isExpression(obj) {
+    return (0, object_utils_js_1.isObject)(obj) && 'expressionType' in obj && (0, operation_node_source_js_1.isOperationNodeSource)(obj);
+}
+exports.isExpression = isExpression;
+function isAliasedExpression(obj) {
+    return ((0, object_utils_js_1.isObject)(obj) &&
+        'expression' in obj &&
+        (0, object_utils_js_1.isString)(obj.alias) &&
+        (0, operation_node_source_js_1.isOperationNodeSource)(obj));
+}
+exports.isAliasedExpression = isAliasedExpression;

package/dist/cjs/index.d.ts

@@ -1,5 +1,6 @@
 export * from './kysely.js';
 export * from './query-creator.js';
+export * from './expression/expression.js';
 export * from './query-builder/where-interface.js';
 export * from './query-builder/returning-interface.js';
 export * from './query-builder/having-interface.js';
@@ -38,6 +39,7 @@ export * from './schema/foreign-key-constraint-builder.js';
 export * from './schema/alter-table-builder.js';
 export * from './schema/create-view-builder.js';
 export * from './schema/drop-view-builder.js';
+export * from './schema/alter-column-builder.js';
 export * from './dynamic/dynamic.js';
 export * from './driver/driver.js';
 export * from './driver/database-connection.js';
@@ -103,7 +105,6 @@ export * from './operation-node/drop-schema-node.js';
 export * from './operation-node/drop-table-node.js';
 export * from './operation-node/drop-type-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-node.js';
@@ -122,7 +123,6 @@ 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';
@@ -157,18 +157,22 @@ export * from './operation-node/over-node.js';
 export * from './operation-node/partition-by-node.js';
 export * from './operation-node/partition-by-item-node.js';
 export * from './operation-node/set-operation-node.js';
+export * from './operation-node/binary-operation-node.js';
+export * from './operation-node/unary-operation-node.js';
 export * from './util/column-type.js';
 export * from './util/compilable.js';
 export * from './util/explainable.js';
 export * from './util/log.js';
-export { AnyColumn, UnknownRow, AnySelectQueryBuilder, } from './util/type-utils.js';
+export { AnyAliasedColumn, AnyAliasedColumnWithTable, AnyColumn, AnyColumnWithTable, AnySelectQueryBuilder, Equals, UnknownRow, } from './util/type-utils.js';
+export * from './util/infer-result.js';
+export { logOnce } from './util/log-once.js';
 export { SelectExpression, SelectExpressionOrList, Selection, } from './parser/select-parser.js';
-export { ReferenceExpression, ReferenceExpressionOrList, StringReference, } from './parser/reference-parser.js';
+export { ReferenceExpression, ReferenceExpressionOrList, SimpleReferenceExpression, StringReference, ExtractTypeFromStringReference, ExtractTypeFromReferenceExpression, } from './parser/reference-parser.js';
 export { ValueExpression, ValueExpressionOrList, } from './parser/value-parser.js';
-export { FilterValueExpression, FilterValueExpressionOrList, ExistsExpression, FilterOperator, } from './parser/filter-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';
 export { OrderByExpression, OrderByDirectionExpression, } from './parser/order-by-parser.js';
-export { SetOperationExpression } from './parser/set-operation-parser.js';
+export { ComparisonOperatorExpression, OperandValueExpression, OperandValueExpressionOrList, } from './parser/binary-operation-parser.js';
+export { ExistsExpression } from './parser/unary-operation-parser.js';

package/dist/cjs/index.js

@@ -14,8 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.logOnce = void 0;
 __exportStar(require("./kysely.js"), exports);
 __exportStar(require("./query-creator.js"), exports);
+__exportStar(require("./expression/expression.js"), exports);
 __exportStar(require("./query-builder/where-interface.js"), exports);
 __exportStar(require("./query-builder/returning-interface.js"), exports);
 __exportStar(require("./query-builder/having-interface.js"), exports);
@@ -54,6 +56,7 @@ __exportStar(require("./schema/foreign-key-constraint-builder.js"), exports);
 __exportStar(require("./schema/alter-table-builder.js"), exports);
 __exportStar(require("./schema/create-view-builder.js"), exports);
 __exportStar(require("./schema/drop-view-builder.js"), exports);
+__exportStar(require("./schema/alter-column-builder.js"), exports);
 __exportStar(require("./dynamic/dynamic.js"), exports);
 __exportStar(require("./driver/driver.js"), exports);
 __exportStar(require("./driver/database-connection.js"), exports);
@@ -119,7 +122,6 @@ __exportStar(require("./operation-node/drop-schema-node.js"), exports);
 __exportStar(require("./operation-node/drop-table-node.js"), exports);
 __exportStar(require("./operation-node/drop-type-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-node.js"), exports);
@@ -138,7 +140,6 @@ __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);
@@ -173,7 +174,12 @@ __exportStar(require("./operation-node/over-node.js"), exports);
 __exportStar(require("./operation-node/partition-by-node.js"), exports);
 __exportStar(require("./operation-node/partition-by-item-node.js"), exports);
 __exportStar(require("./operation-node/set-operation-node.js"), exports);
+__exportStar(require("./operation-node/binary-operation-node.js"), exports);
+__exportStar(require("./operation-node/unary-operation-node.js"), exports);
 __exportStar(require("./util/column-type.js"), exports);
 __exportStar(require("./util/compilable.js"), exports);
 __exportStar(require("./util/explainable.js"), exports);
 __exportStar(require("./util/log.js"), exports);
+__exportStar(require("./util/infer-result.js"), exports);
+var log_once_js_1 = require("./util/log-once.js");
+Object.defineProperty(exports, "logOnce", { enumerable: true, get: function () { return log_once_js_1.logOnce; } });

package/dist/cjs/migration/file-migration-provider.js

@@ -27,11 +27,13 @@ class FileMigrationProvider {
         const migrations = {};
         const files = await this.#props.fs.readdir(this.#props.migrationFolder);
         for (const fileName of files) {
-            if ((fileName.endsWith('.js') || fileName.endsWith('.ts') || fileName.endsWith('.mjs')) &&
-                !fileName.endsWith('.d.ts')) {
+            if (fileName.endsWith('.js') ||
+                (fileName.endsWith('.ts') && !fileName.endsWith('.d.ts')) ||
+                fileName.endsWith('.mjs') ||
+                (fileName.endsWith('.mts') && !fileName.endsWith('.d.mts'))) {
                 const migration = await Promise.resolve().then(() => require(
                 /* webpackIgnore: true */ this.#props.path.join(this.#props.migrationFolder, fileName)));
-                const migrationKey = fileName.substring(0, fileName.length - 3);
+                const migrationKey = fileName.substring(0, fileName.lastIndexOf('.'));
                 // Handle esModuleInterop export's `default` prop...
                 if (isMigration(migration?.default)) {
                     migrations[migrationKey] = migration.default;

package/dist/cjs/operation-node/aggregate-function-node.d.ts

@@ -1,13 +1,14 @@
-import { ColumnNode } from './column-node.js';
 import { OperationNode } from './operation-node.js';
 import { OverNode } from './over-node.js';
-import { ReferenceNode } from './reference-node.js';
+import { SimpleReferenceExpressionNode } from './simple-reference-expression-node.js';
+import { WhereNode } from './where-node.js';
 declare type AggregateFunction = 'avg' | 'count' | 'max' | 'min' | 'sum';
 export interface AggregateFunctionNode extends OperationNode {
     readonly kind: 'AggregateFunctionNode';
     readonly func: AggregateFunction;
-    readonly column: ColumnNode | ReferenceNode;
+    readonly column: SimpleReferenceExpressionNode;
     readonly distinct?: boolean;
+    readonly filter?: WhereNode;
     readonly over?: OverNode;
 }
 /**
@@ -15,8 +16,10 @@ export interface AggregateFunctionNode extends OperationNode {
  */
 export declare const AggregateFunctionNode: Readonly<{
     is(node: OperationNode): node is AggregateFunctionNode;
-    create(aggregateFunction: AggregateFunction, column: ColumnNode | ReferenceNode): AggregateFunctionNode;
+    create(aggregateFunction: AggregateFunction, column: SimpleReferenceExpressionNode): AggregateFunctionNode;
     cloneWithDistinct(aggregateFunctionNode: AggregateFunctionNode): AggregateFunctionNode;
+    cloneWithFilter(aggregateFunctionNode: AggregateFunctionNode, filter: OperationNode): AggregateFunctionNode;
+    cloneWithOrFilter(aggregateFunctionNode: AggregateFunctionNode, filter: OperationNode): AggregateFunctionNode;
     cloneWithOver(aggregateFunctionNode: AggregateFunctionNode, over?: OverNode): AggregateFunctionNode;
 }>;
 export {};

package/dist/cjs/operation-node/aggregate-function-node.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AggregateFunctionNode = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
+const where_node_js_1 = require("./where-node.js");
 /**
  * @internal
  */
@@ -22,6 +23,22 @@ exports.AggregateFunctionNode = (0, object_utils_js_1.freeze)({
             distinct: true,
         });
     },
+    cloneWithFilter(aggregateFunctionNode, filter) {
+        return (0, object_utils_js_1.freeze)({
+            ...aggregateFunctionNode,
+            filter: aggregateFunctionNode.filter
+                ? where_node_js_1.WhereNode.cloneWithOperation(aggregateFunctionNode.filter, 'And', filter)
+                : where_node_js_1.WhereNode.create(filter),
+        });
+    },
+    cloneWithOrFilter(aggregateFunctionNode, filter) {
+        return (0, object_utils_js_1.freeze)({
+            ...aggregateFunctionNode,
+            filter: aggregateFunctionNode.filter
+                ? where_node_js_1.WhereNode.cloneWithOperation(aggregateFunctionNode.filter, 'Or', filter)
+                : where_node_js_1.WhereNode.create(filter),
+        });
+    },
     cloneWithOver(aggregateFunctionNode, over) {
         return (0, object_utils_js_1.freeze)({
             ...aggregateFunctionNode,

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

@@ -1,21 +1,13 @@
-import { AggregateFunctionNode } from './aggregate-function-node.js';
-import { ColumnNode } from './column-node.js';
-import { IdentifierNode } from './identifier-node.js';
 import { OperationNode } from './operation-node.js';
-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 | SelectQueryNode | RawNode | AggregateFunctionNode;
 export interface AliasNode extends OperationNode {
     readonly kind: 'AliasNode';
-    readonly node: AliasNodeChild;
-    readonly alias: IdentifierNode | RawNode;
+    readonly node: OperationNode;
+    readonly alias: OperationNode;
 }
 /**
  * @internal
  */
 export declare const AliasNode: Readonly<{
     is(node: OperationNode): node is AliasNode;
-    create(node: AliasNodeChild, alias: IdentifierNode | RawNode): AliasNode;
+    create(node: OperationNode, alias: OperationNode): AliasNode;
 }>;